Skip to content

Issue298 #27

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.

Sign up for GitHub

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

Jump to bottom
Open
wsalesky wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Issue298 #27

wsalesky wants to merge 11 commits into from

Conversation

@wsalesky
Copy link

@wsalesky wsalesky commented Jul 21, 2017

Resolves conflicts introduced by Papryi.info/DCLP merge.
Merge conflicts found in the following (resolved by hand):

pn-xslt/MakeHTML.xsl
pn-xslt/metadata.xsl
pn-xslt/metadata-dclp.xsl
pn-mapping/project.clj
pn-mapping/src/info/papyri/map.clj

Note, <h1> will need to be manually set to DCLP.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wsalesky @hcayless