Update bodl-auct-d-4-1.xml

acdh-oeaw · Dec 10, 2024 · 069ab9d · 069ab9d
1 parent f808c73
commit 069ab9d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/xml/bodl-auct-d-4-1/bodl-auct-d-4-1.xml b/xml/bodl-auct-d-4-1/bodl-auct-d-4-1.xml
@@ -9168,7 +9168,7 @@
                   </seg>
                </ab>
             </div>
-<<<<<<< HEAD
+
             <!-- ps 22 bibletext -->
             <div type="bibletext" xml:id="bodl-auct-d-4-1-22-1" subtype="commented">
                <ab xml:lang="grc">
@@ -9245,7 +9245,8 @@
                            target="#vat-gr-754:vat-gr-754-fr-22-3" type="XXXX">Vat. gr. 754</ref>
                      <note type="attribution" xml:lang="grc">XXXX</note>
                   </seg>
-=======
+               </ab>
+            </div>
 
             <pb n="74v"/>
 
@@ -9327,7 +9328,7 @@
                      xml:id="bodl-auct-d-4-1-ps-26-14b"/>ἀνδρίζου, καὶ κραταιούσθω ἡ καρδία σου, <anchor
                         type="psalmtext" n="Ps (LXX) 26,14c" xml:id="bodl-auct-d-4-1-ps-26-14c"/>καὶ ὑπόμεινον
                   τὸν κύριον. </quote>
-            </div>
+                                      </div>
 
                         <!-- ps 26 commentary -->
 
@@ -9382,7 +9383,6 @@
                         corresp="#person-18">σωτήρ ὁ φωτίζων καὶ σώζων με ἐκ πάντων·</quote>
                                        </seg>
 
->>>>>>> 31d82757435d0dc96b578df446c396dc517a6b19
                </ab>
             </div>
             <!--