Skip to content

Commit

Permalink
Merge pull request #564 from M-L-D-H/jsb
Browse files Browse the repository at this point in the history
Update projects
  • Loading branch information
JoudySidoBozan authored Dec 6, 2024
2 parents 6768f34 + 5245dc3 commit 2beedd9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions PROJECTS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions PROJECTS/pgp/1927805e-27ad-4508-9987-196b1010f0e1.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -118,7 +118,7 @@
"digital_edition",
"digital_preservation",
"catalog",
"corpus",
"corpus_output",
"geodata",
"image",
"manuscript",
Expand Down

0 comments on commit 2beedd9

Please sign in to comment.