New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve git conflicts stored in the files #17

Open

xmnlab opened this issue Jul 17, 2024 · 0 comments

Member

xmnlab commented Jul 17, 2024

example:

<<<<<<< HEAD
langchain = "^0.1.12"
openai = "^1.14.1"
=======
sqlmodel = ">=0.0.16"
fhir-resources = ">=7.1.0"
>>>>>>> upstream/main

langchain = "^0.1.12"
openai = "^1.14.1"
sqlmodel = ">=0.0.16"
fhir-resources = ">=7.1.0"

The text was updated successfully, but these errors were encountered:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment