diff --git a/PROJECTS.json b/PROJECTS.json index 1276de8a..82b040b5 100644 --- a/PROJECTS.json +++ b/PROJECTS.json @@ -574,6 +574,8 @@ "1927805e-27ad-4508-9987-196b1010f0e1": { "title": "Princeton Genzia Project", "path": "/PROJECTS/pgp/" +<<<<<<< HEAD +======= }, "ba1523cc-df9a-4665-8f44-c13ea3542492": { "title": "Roshan Initiative in Persian Digital Humanities", @@ -586,6 +588,7 @@ "7dbf301a-6216-4eb7-8645-dbe94e108fe6": { "title": "Persian Manuscript Initiative", "path": "/PROJECTS/persian_manuscript_initiative/" +>>>>>>> origin }, "c1a2957b-0c24-46e6-9a67-381997525a87": { "title": "Post-predicate Elements in Iranian: Inheritance, Contact, and Information Structure", diff --git a/PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8 b/PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8.json similarity index 99% rename from PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8 rename to PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8.json index d6512251..b35714e1 100644 --- a/PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8 +++ b/PROJECTS/open_htr/192ddf37-ff95-454d-beb1-919c8e71c6b8.json @@ -30,7 +30,7 @@ { "relation_type": "host", "org_name": { - "text": "collaboration", + "text": "Princeton University", "ref": [ "https://ror.org/00hx57361", "http://www.wikidata.org/entity/Q21578" diff --git a/PROJECTS/pgp/1927805e-27ad-4508-9987-196b1010f0e1.json b/PROJECTS/pgp/1927805e-27ad-4508-9987-196b1010f0e1.json index e0e9f117..9b6d1dea 100644 --- a/PROJECTS/pgp/1927805e-27ad-4508-9987-196b1010f0e1.json +++ b/PROJECTS/pgp/1927805e-27ad-4508-9987-196b1010f0e1.json @@ -39,7 +39,7 @@ "websites": ["https://www.princeton.edu/"] }, { - "relation_type": "collaboration", + "relation_type": "cooperation", "org_name": { "text": "The center for Digital Humanities at Princeton", "ref": [ @@ -118,7 +118,7 @@ "digital_edition", "digital_preservation", "catalog", - "corpus", + "corpus_output", "geodata", "image", "manuscript",