fix rebase conflicts

FAIRmat-NFDI · Aug 30, 2024 · 6ffb9d6 · 6ffb9d6
1 parent dfad4b5
commit 6ffb9d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/contributed_definitions/NXfit_function.nxdl.xml b/contributed_definitions/NXfit_function.nxdl.xml
@@ -44,4 +44,4 @@
         </doc>
     </field>
     <group type="NXfit_parameter"/>
-</definition>
+</definition>
diff --git a/contributed_definitions/NXpeak.nxdl.xml b/contributed_definitions/NXpeak.nxdl.xml
@@ -83,4 +83,4 @@
              Total area under the curve.
         </doc>
     </field>
-</definition>
+</definition>
diff --git a/contributed_definitions/nyaml/NXfit_function.yaml b/contributed_definitions/nyaml/NXfit_function.yaml
@@ -67,4 +67,4 @@ NXfit_function(NXobject):
 #         </doc>
 #     </field>
 #     <group type="NXfit_parameter"/>
-# </definition>
+# </definition>
diff --git a/contributed_definitions/nyaml/NXpeak.yaml b/contributed_definitions/nyaml/NXpeak.yaml
@@ -136,4 +136,4 @@ NXpeak(NXobject):
 #              Total area under the curve.
 #         </doc>
 #     </field>
-# </definition>
+# </definition>