fixing merge conflict: adding transcription Montalvo chapters 1-33

ebeshero / Amadis-in-Translation

a project to apply TEI markup to investigate early modern Spanish editions of Amadis de Gaula and their translations into English and French from the 1500s to the early nineteenth century.

http://amadis.newtfire.org

GNU Affero General Public License v3.0

4 stars 6 forks source link

fixing merge conflict: adding transcription Montalvo chapters 1-33 #68

Closed msb81 closed 7 years ago

msb81 commented 7 years ago

@ebeshero @setriplette Can you guys please pull, this will fix our merge conflict and make our repos line up again.