resolved conflict

obophenotype · Dec 8, 2014 · 0623d8a · 0623d8a
2 parents db8f576 + b80562e
commit 0623d8a
Show file tree

Hide file tree

Showing 3 changed files with 377 additions and 364 deletions.
diff --git a/src/ontology/caro-idranges.owl b/src/ontology/caro-idranges.owl
@@ -21,8 +21,8 @@ Annotations: allocatedto: ""
 EquivalentTo: xsd:integer[> 1000 , <= 9999]
 
 Datatype: idrange: 3
-Annotations: allocatedto: ""
-EquivalentTo: xsd:integer[> 10000 , <= 29999]
+Annotations: allocatedto: "David Osumi-Sutherland"
+EquivalentTo: xsd:integer[> 20000 , <= 29999]
 
 Datatype: idrange: 4
 Annotations: allocatedto: "Meliisa Haendel"