pkp/pkp-lib#5885 updated using new slider component

pkp · Aug 30, 2024 · 0932173 · 0932173
1 parent eccf797
commit 0932173
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 386 deletions.
diff --git a/src/components/Form/FormGroup.vue b/src/components/Form/FormGroup.vue
@@ -94,6 +94,7 @@ export default {
 		FieldMetadataSetting,
 		FieldOptions,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 		FieldOrcid,
 =======
@@ -102,6 +103,8 @@ export default {
 >>>>>>> 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,