While working on #177, I discovered that @kirchnerf and @anagnosis have made 5 commits to the "dclp" branch of DCLP/idp.data since 31 March that have not been merged to the "master" branch. The "dclp" branch was deprecated in February. This change was coordinated with Heidelberg, but we failed to inform Würzburg. Please accept my apologies for that oversight and for the additional work outlined below. I will forward the email trail to you for record.
Therefore, I request that @HolgerEssler, @anagnosis, and @kirchnerf:
review these commits,
merge FROM DCLP/idp.data "master" into DCLP/idp.data "dclp" (i.e., don't change content in "master"),
resolve the conflicts appropriately, and then
issue a pull request against DCLP/idp.data "master" (not against papyri.idp.data) for their review and incorporation, assigning the pull request to me.
While working on #177, I discovered that @kirchnerf and @anagnosis have made 5 commits to the "dclp" branch of DCLP/idp.data since 31 March that have not been merged to the "master" branch. The "dclp" branch was deprecated in February. This change was coordinated with Heidelberg, but we failed to inform Würzburg. Please accept my apologies for that oversight and for the additional work outlined below. I will forward the email trail to you for record.
I would have merged these changes into DCLP/idp.data "master" myself, but there are merge conflicts. Eighty-nine files are affected.
Therefore, I request that @HolgerEssler, @anagnosis, and @kirchnerf: