Skip to content

Commit da12720

Browse files
Ahmad-mtoscreatorrrHamadaSalhabJulep Developersgithub-actions[bot]
authored
fix: resolve conflicts with main (#826)
<!-- ELLIPSIS_HIDDEN --> > [!IMPORTANT] > Resolve conflicts with main by updating submodule paths and commits, and resetting the changelog. > > - **Submodules**: > - Reorder submodules in `.gitmodules` to place `code-interpreter/vendor/cohere-ai/cohere-terrarium` first. > - Update `sdks/node-sdk` submodule to commit `6cb742b`. > - Update `sdks/python-sdk` submodule to commit `7f9bc0c`. > - **Changelog**: > - Reset `CHANGELOG.md` to a template format with a placeholder for future updates. > > <sup>This description was created by </sup>[<img alt="Ellipsis" src="https://img.shields.io/badge/Ellipsis-blue?color=175173">](https://www.ellipsis.dev?ref=julep-ai%2Fjulep&utm_source=github&utm_medium=referral)<sup> for bb19195. It will automatically update as commits are pushed.</sup> <!-- ELLIPSIS_HIDDEN --> Signed-off-by: Diwank Singh Tomer <[email protected]> Co-authored-by: Diwank Singh Tomer <[email protected]> Co-authored-by: Hamada Salhab <[email protected]> Co-authored-by: Julep Developers <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: creatorrr <[email protected]> Co-authored-by: ijindal1 <[email protected]> Co-authored-by: Vedant Sahai <[email protected]> Co-authored-by: Vivek Gurudutt K <[email protected]> Co-authored-by: JeevaRamanathan <[email protected]> Co-authored-by: Ho Yin <[email protected]> Co-authored-by: Ikko Eltociear Ashimine <[email protected]> Co-authored-by: HamadaSalhab <[email protected]> Co-authored-by: Shuvojit Das <[email protected]> Co-authored-by: Bilal Mirza <[email protected]> Co-authored-by: whiterabbit1983 <[email protected]> Co-authored-by: whiterabbit1983 <[email protected]> Co-authored-by: ItsAmziii <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: itsamziii <[email protected]> Co-authored-by: Utsav bhattarai <[email protected]> Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> Co-authored-by: Sudhanshu Tripathi <[email protected]>
1 parent b0995d7 commit da12720

File tree

4 files changed

+17
-443
lines changed

4 files changed

+17
-443
lines changed

.gitmodules

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[submodule "sdks/node-sdk"]
2-
path = sdks/node-sdk
3-
url = https://github.com/julep-ai/node-sdk.git
4-
[submodule "sdks/python-sdk"]
5-
path = sdks/python-sdk
6-
url = https://github.com/julep-ai/python-sdk.git
71
[submodule "code-interpreter/vendor/cohere-ai/cohere-terrarium"]
82
path = code-interpreter/vendor/cohere-ai/cohere-terrarium
93
url = https://github.com/cohere-ai/cohere-terrarium.git
4+
[submodule "sdks/python-sdk"]
5+
path = sdks/python-sdk
6+
url = https://github.com/julep-ai/python-sdk.git
7+
[submodule "sdks/node-sdk"]
8+
path = sdks/node-sdk
9+
url = https://github.com/julep-ai/node-sdk.git

0 commit comments

Comments
 (0)