Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dclp #9

Merged
merged 7 commits into from
Jun 7, 2017
Merged

Dclp #9

merged 7 commits into from
Jun 7, 2017

Conversation

anagnosis
Copy link

The master branch has been merged into dclp, yet no merge conflicts were displayed. Is there anything we overlooked?

@paregorios
Copy link
Member

@anagnosis I see only one problem with these changes. On line 3 of TM 59493 you will note that the TEI namespace URI has been altered, rendering the file invalid. Please commit a fix to the "dclp" branch for this file and push to github. Once that file is valid, then I will accept and merge the pull request. Thanks.

@anagnosis
Copy link
Author

anagnosis commented Jun 7, 2017

Thank you very much for your reply. I have fixed the TEI namespace URI in TM 59493, which should now be valid.

@paregorios paregorios merged commit 338c7eb into master Jun 7, 2017
paregorios added a commit to DCLP/dclpxsltbox that referenced this pull request Jun 9, 2017
paregorios added a commit to DCLP/dclpxsltbox that referenced this pull request Jun 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants