OA-237 Saubere Erfassung von mehreren Berichtsjahren: Korrektur

gbv · Nov 13, 2024 · c76f366 · c76f366
1 parent 3131ecb
commit c76f366
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/main/resources/META-INF/resources/editor/editor-customization.xed b/src/main/resources/META-INF/resources/editor/editor-customization.xed
@@ -519,11 +519,7 @@
       <xed:repeat xpath="annualReviewComposit">
         <div class="mir-fieldset-content">
           <xed:bind xpath="mods:classification[@displayLabel='annual_review'][@authorityURI='https://www.openagrar.de/classifications/annual_review']">
-<<<<<<< HEAD
             <div class="form-group row">
-=======
-            <div class="form-group row  oa-noteLocationCorp">
->>>>>>> 2da2d11 (OA-237 Saubere Erfassung von mehreren Berichtsjahren)
               <label class="col-md-3 col-form-label text-right">
                 <xed:output i18n="oa.annualReview" />
               </label>
@@ -536,11 +532,7 @@
                     </select>
                   </div>
                 </div>
-<<<<<<< HEAD
                 <mir:help-pmud help-text="{i18n:oa.help.annualReview}" pmud="true" />
-=======
-                <mir:help-pmud help-text="{i18n:oa.help.annualReview}" pmud="false" />
->>>>>>> 2da2d11 (OA-237 Saubere Erfassung von mehreren Berichtsjahren)
               </xed:bind>
             </div>
             <mir:textfield xpath="@edition" label="oa.annualReview.edition" placeholder="{i18n:oa.placeholder.annualReview}"