development build

DotCamp · Jun 25, 2024 · 2c5a0fc · 2c5a0fc
1 parent 88141ee
commit 2c5a0fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,15 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => 'ultimate-blocks/ultimate-blocks',
-<<<<<<< HEAD
         'pretty_version' => 'dev-v3_2_0',
         'version' => 'dev-v3_2_0',
-        'reference' => '585efc00c5bd16093db33f597b75b2f89a9225b8',
-=======
-        'pretty_version' => 'dev-master',
-        'version' => 'dev-master',
-        'reference' => '6b1200ba78c3259969de03b6957b8967639746a5',
->>>>>>> master
+        'reference' => '88141eecc70932da15d539fb3a3af9de7f8f621f',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -62,15 +56,9 @@
             'dev_requirement' => false,
         ),
         'ultimate-blocks/ultimate-blocks' => array(
-<<<<<<< HEAD
             'pretty_version' => 'dev-v3_2_0',
             'version' => 'dev-v3_2_0',
-            'reference' => '585efc00c5bd16093db33f597b75b2f89a9225b8',
-=======
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
-            'reference' => '6b1200ba78c3259969de03b6957b8967639746a5',
->>>>>>> master
+            'reference' => '88141eecc70932da15d539fb3a3af9de7f8f621f',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

diff --git a/zip/info.json b/zip/info.json
@@ -1,12 +1,6 @@
 {
   "version": "3.2.0-dev",
-<<<<<<< HEAD
   "mode": "development",
   "size": "7.55mb",
-  "date": "2024-06-25T09:38:37.208Z"
-=======
-  "mode": "production",
-  "size": "7.17mb",
-  "date": "2024-06-25T07:09:02.841Z"
->>>>>>> master
+  "date": "2024-06-25T16:43:09.937Z"
 }
diff --git a/zip/ultimate-blocks.zip b/zip/ultimate-blocks.zip