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.

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

For testing trivial git conflicts #2551

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

For testing trivial git conflicts #2551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/ontology/cl-edit.owl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,7 @@ Declaration(Class(obo:CL_0008037))
Declaration(Class(obo:CL_0008038))
Declaration(Class(obo:CL_0008039))
Declaration(Class(obo:CL_0008040))
Declaration(Class(obo:CL_0008042))
Declaration(Class(obo:CL_0008046))
Declaration(Class(obo:CL_0008047))
Declaration(Class(obo:CL_0008048))
Expand Down Expand Up @@ -3259,6 +3260,7 @@ Declaration(AnnotationProperty(oboInOwl:id))
Declaration(AnnotationProperty(oboInOwl:inSubset))
Declaration(AnnotationProperty(oboInOwl:is_inferred))
Declaration(AnnotationProperty(oboInOwl:shorthand))
Declaration(AnnotationProperty(<http://www.geneontology.org/formats/oboInOwl#http://purl.org/dc/terms/contributor>))
Declaration(AnnotationProperty(rdfs:comment))
Declaration(AnnotationProperty(rdfs:label))
Declaration(AnnotationProperty(rdfs:seeAlso))
Expand Down Expand Up @@ -22659,6 +22661,13 @@ SubClassOf(obo:CL_0008040 obo:CL_0002139)
SubClassOf(obo:CL_0008040 obo:CL_0002653)
SubClassOf(obo:CL_0008040 ObjectSomeValuesFrom(obo:BFO_0000050 obo:UBERON_0001979))

# Class: obo:CL_0008042 (trivial clash test 2)

AnnotationAssertion(terms:date obo:CL_0008042 "2024-09-09T12:35:55Z"^^xsd:dateTime)
AnnotationAssertion(<http://www.geneontology.org/formats/oboInOwl#http://purl.org/dc/terms/contributor> obo:CL_0008042 <https://orcid.org/0000-0002-7073-9172>)
AnnotationAssertion(rdfs:label obo:CL_0008042 "trivial clash test 2"@en)
SubClassOf(obo:CL_0008042 obo:CL_0000000)

# Class: obo:CL_0008046 (extrafusal muscle fiber)

AnnotationAssertion(Annotation(oboInOwl:hasDbXref "DOI:10.1016/B978-0-443-10321-6.00004-7") Annotation(oboInOwl:hasDbXref "Wikipedia:Extrafusal_muscle_fiber&oldid=978415293") obo:IAO_0000115 obo:CL_0008046 "A skeletal muscle fiber that is innervated by alpha motor neuron and generates tension by contracting, thereby allowing for skeletal movement. These fibers make up the large mass of skeletal muscle tissue and are attached to bones by tendons.")
Expand Down
Loading