pkp/pkp-lib#5885 fixed merged conflict

pkp · Aug 14, 2024 · cbcfc9b · cbcfc9b
1 parent 1509bd8
commit cbcfc9b
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/components/Form/FormGroup.vue b/src/components/Form/FormGroup.vue
@@ -93,18 +93,7 @@ export default {
 		FieldHtml,
 		FieldMetadataSetting,
 		FieldOptions,
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 		FieldOrcid,
-=======
-		FieldCheckbox,
-=======
->>>>>>> c89f0b3 (pkp/pkp-lib#5885 removed unnecessary fields and controls with field range component enhancement)
-		FieldRangeSlider,
->>>>>>> 81f8819 (pkp/pkp-lib#5885 updated and added new UI component)
-=======
->>>>>>> 7dabf2c (pkp/pkp-lib#5885 updated using new slider component)
 		FieldPreparedContent,
 		FieldRadioInput,
 		FieldRichTextarea,