Commit 1ebba2b4 authored by Christian Schaper's avatar Christian Schaper
Browse files

Versionskonflikt-Notiz entfernt

parent 7d41d158
......@@ -253,13 +253,7 @@
<pb n="2" facs="entwurf1916_04.png"/>
<<<<<<< .mine
<note type="objdesc" resp="#christian.schaper">[vacat]</note>
=======
<note resp="#christian.schaper">[vacat]</note>
>>>>>>> .r1550
<pb n="3" facs="entwurf1916_05.png"/>
<div type="dedication"><ab rend="align(center)">Dem Musiker in Worten
<lb/><persName ref="#p0086">Rainer Maria Rilke</persName>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment