Rebuild assets

pods-framework · Jun 17, 2024 · c64b059 · c64b059
1 parent ec3db1e
commit c64b059
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/ui/js/blocks/pods-blocks-api.min.asset.json b/ui/js/blocks/pods-blocks-api.min.asset.json
@@ -6,6 +6,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 {"dependencies":["lodash","react","react-dom","wp-api-fetch","wp-autop","wp-block-editor","wp-blocks","wp-components","wp-compose","wp-date","wp-element","wp-i18n","wp-keycodes","wp-server-side-render","wp-url"],"version":"a1a9a682d3f5528a467c"}
 =======
 {"dependencies":["lodash","react","react-dom","wp-api-fetch","wp-autop","wp-block-editor","wp-blocks","wp-components","wp-compose","wp-date","wp-element","wp-i18n","wp-keycodes","wp-server-side-render","wp-url"],"version":"093a1202eff12a66463c"}
@@ -67,3 +68,6 @@
 >>>>>>> 289feea97 (Auto rebuild assets)
 >>>>>>> 74caecaa9 (Auto rebuild assets)
 >>>>>>> 8ebcf39ef (Auto rebuild assets)
+=======
+{"dependencies":["lodash","react","react-dom","wp-api-fetch","wp-autop","wp-block-editor","wp-blocks","wp-components","wp-compose","wp-date","wp-element","wp-i18n","wp-keycodes","wp-server-side-render","wp-url"],"version":"3093dd2e3e3359558f91"}
+>>>>>>> 01fb40a86 (Rebuild assets)
diff --git a/ui/js/blocks/pods-blocks-api.min.js b/ui/js/blocks/pods-blocks-api.min.js
diff --git a/ui/js/dfv/pods-dfv.min.asset.json b/ui/js/dfv/pods-dfv.min.asset.json
@@ -4,6 +4,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 {"dependencies":["lodash","moment","react","react-dom","wp-api-fetch","wp-autop","wp-components","wp-compose","wp-data","wp-element","wp-hooks","wp-i18n","wp-keycodes","wp-plugins","wp-polyfill","wp-primitives","wp-url"],"version":"9faf935c9dd19e2293d2"}
 =======
 {"dependencies":["lodash","moment","react","react-dom","wp-api-fetch","wp-autop","wp-components","wp-compose","wp-data","wp-element","wp-hooks","wp-i18n","wp-keycodes","wp-plugins","wp-polyfill","wp-primitives","wp-url"],"version":"f91dc3d6ca8a45fbfac3"}
@@ -49,3 +50,6 @@
 >>>>>>> 8aa29542e (Auto rebuild assets)
 >>>>>>> 6fe5fc48f (Auto rebuild assets)
 >>>>>>> ea4d105e2 (Auto rebuild assets)
+=======
+{"dependencies":["lodash","moment","react","react-dom","wp-api-fetch","wp-autop","wp-components","wp-compose","wp-data","wp-element","wp-hooks","wp-i18n","wp-keycodes","wp-plugins","wp-polyfill","wp-primitives","wp-url"],"version":"e9a890f77fe714a88c36"}
+>>>>>>> 01fb40a86 (Rebuild assets)
diff --git a/ui/js/dfv/pods-dfv.min.js b/ui/js/dfv/pods-dfv.min.js