Skip to content
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.

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

Merge conflicts in kgcl.owl.ttl #68

Closed
nlharris opened this issue Nov 6, 2024 · 4 comments
Closed

Merge conflicts in kgcl.owl.ttl #68

nlharris opened this issue Nov 6, 2024 · 4 comments

Comments

@nlharris
Copy link
Contributor

nlharris commented Nov 6, 2024

https://github.com/INCATools/kgcl-rdflib/blob/master/owl/kgcl.owl.ttl has merge conflicts that need to be resolved (the first one starts at line 63).

@cmungall
Copy link
Collaborator

cmungall commented Nov 6, 2024

The action here is to remove all generated files in this repo, everything under owl/ and python/. These are now in the main repo!

@nlharris
Copy link
Contributor Author

@cmungall @caufieldjh https://github.com/INCATools/kgcl-rdflib/blob/master/owl/kgcl.owl.ttl still exists and still has merge conflicts - should it be removed? Is there a PR for removing these generated files, as Chris suggested?

@caufieldjh
Copy link
Contributor

Yes, those changes are now in #69 - ready to merge (I can do it if given write access to this repo)

@nlharris
Copy link
Contributor Author

#69 merged; closing this as fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants