development build

DotCamp · Aug 12, 2024 · d8aa709 · d8aa709
1 parent b2d6b97
commit d8aa709
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 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_2',
         'version' => 'dev-v3_2_2',
-        'reference' => '9481b82ee853109b17a4344337971eaeab6fbd40',
-=======
-        'pretty_version' => 'dev-master',
-        'version' => 'dev-master',
-        'reference' => 'b4f86eba24371c93c8893627e72d0cb3d364e91f',
->>>>>>> master
+        'reference' => 'b2d6b977f60db1992ca008377a9ffb632edc3f45',
         '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_2',
             'version' => 'dev-v3_2_2',
-            'reference' => '9481b82ee853109b17a4344337971eaeab6fbd40',
-=======
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
-            'reference' => 'b4f86eba24371c93c8893627e72d0cb3d364e91f',
->>>>>>> master
+            'reference' => 'b2d6b977f60db1992ca008377a9ffb632edc3f45',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

diff --git a/zip/info.json b/zip/info.json
@@ -1,13 +1,6 @@
 {
-<<<<<<< HEAD
   "version": "3.2.2-dev",
   "mode": "development",
   "size": "7.78mb",
-  "date": "2024-08-12T11:52:45.953Z"
-=======
-  "version": "3.2.1",
-  "mode": "production",
-  "size": "7.12mb",
-  "date": "2024-07-23T04:56:39.092Z"
->>>>>>> master
+  "date": "2024-08-12T13:46:22.521Z"
 }
diff --git a/zip/ultimate-blocks.zip b/zip/ultimate-blocks.zip