Adding code someone removes in conflicts

ProcessMaker · Oct 22, 2024 · 3d1db8d · 3d1db8d
1 parent 2250ad9
commit 3d1db8d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/form-builder-controls.js b/src/form-builder-controls.js
@@ -46,7 +46,9 @@ import {
   tooltipProperty,
   LoadingSubmitButtonProperty,
   LabelSubmitButtonProperty,
-  bgcolorModern
+  bgcolorModern,
+  bgcolorPropertyRecord,
+  colorPropertyRecord,
 } from './form-control-common-properties';
 
 export default [
@@ -566,8 +568,8 @@ export default [
             helper: ''
           }
         },
-        colorProperty,
-        bgcolorProperty,
+        colorPropertyRecord,
+        bgcolorPropertyRecord,
         bgcolorModern
       ],
     },