Skip to content

Commit

Permalink
fix: resolve conflicts with main (#826)
Browse files Browse the repository at this point in the history
<!-- 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]>
  • Loading branch information
23 people authored Nov 11, 2024
1 parent b0995d7 commit da12720
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 443 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "sdks/node-sdk"]
path = sdks/node-sdk
url = https://github.com/julep-ai/node-sdk.git
[submodule "sdks/python-sdk"]
path = sdks/python-sdk
url = https://github.com/julep-ai/python-sdk.git
[submodule "code-interpreter/vendor/cohere-ai/cohere-terrarium"]
path = code-interpreter/vendor/cohere-ai/cohere-terrarium
url = https://github.com/cohere-ai/cohere-terrarium.git
[submodule "sdks/python-sdk"]
path = sdks/python-sdk
url = https://github.com/julep-ai/python-sdk.git
[submodule "sdks/node-sdk"]
path = sdks/node-sdk
url = https://github.com/julep-ai/node-sdk.git
Loading

0 comments on commit da12720

Please sign in to comment.