conflict resolution

kingsdigitallab · Oct 1, 2024 · fb0556d · fb0556d
2 parents b7822d0 + c9a008a
commit fb0556d
Show file tree

Hide file tree

Showing 3 changed files with 91,177 additions and 91,193 deletions.
diff --git a/annotations/http-sicily-classics-ox-ac-uk-inscription-isic000085-isic000085-jpg.json b/annotations/http-sicily-classics-ox-ac-uk-inscription-isic000085-isic000085-jpg.json
@@ -168,10 +168,10 @@
               ]
             }
           },
-          "character": "A",
           "tags": [
             "serif.hairline"
-          ]
+          ],
+          "character": "A"
         }
       }
     ],
@@ -441,12 +441,12 @@
               ]
             }
           },
-          "character": "C",
           "tags": [
             "test",
             "test3",
             "testtag"
-          ]
+          ],
+          "character": "C"
         }
       }
     ],
@@ -1071,7 +1071,7 @@
     "creator": "https://api.github.com/users/simonastoyanova",
     "created": "2023-11-24T21:08:55.802Z",
     "modifiedBy": "https://api.github.com/users/geoffroy-noel-ddh",
-    "modified": "2024-08-08T13:49:18.273Z"
+    "modified": "2024-10-01T00:18:50.141Z"
   },
   {
     "@context": "http://www.w3.org/ns/anno.jsonld",