NTR: Fix conflicts

mollie · Sep 19, 2024 · 43a4348 · 43a4348
1 parent 40134f9
commit 43a4348
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 66 deletions.
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,8 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-<<<<<<< HEAD
-return ComposerAutoloaderInit0e545bd79f2c55e11f645381af268f35::getLoader();
-=======
-return ComposerAutoloaderInit048a628bc63e0bdd9ef175499008e74a::getLoader();
->>>>>>> parent of d57337a (NTR: Update dependencies)
+return ComposerAutoloaderInite833291eee48a309ec3057562bb8d92f::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,11 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-<<<<<<< HEAD
-class ComposerAutoloaderInit0e545bd79f2c55e11f645381af268f35
-=======
-class ComposerAutoloaderInit048a628bc63e0bdd9ef175499008e74a
->>>>>>> parent of d57337a (NTR: Update dependencies)
+class ComposerAutoloaderInite833291eee48a309ec3057562bb8d92f
 {
     private static $loader;
 
@@ -28,25 +24,15 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-<<<<<<< HEAD
-        spl_autoload_register(array('ComposerAutoloaderInit0e545bd79f2c55e11f645381af268f35', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInite833291eee48a309ec3057562bb8d92f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit0e545bd79f2c55e11f645381af268f35', 'loadClassLoader'));
-=======
-        spl_autoload_register(array('ComposerAutoloaderInit048a628bc63e0bdd9ef175499008e74a', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit048a628bc63e0bdd9ef175499008e74a', 'loadClassLoader'));
->>>>>>> parent of d57337a (NTR: Update dependencies)
+        spl_autoload_unregister(array('ComposerAutoloaderInite833291eee48a309ec3057562bb8d92f', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-<<<<<<< HEAD
-            call_user_func(\Composer\Autoload\ComposerStaticInit0e545bd79f2c55e11f645381af268f35::getInitializer($loader));
-=======
-            call_user_func(\Composer\Autoload\ComposerStaticInit048a628bc63e0bdd9ef175499008e74a::getInitializer($loader));
->>>>>>> parent of d57337a (NTR: Update dependencies)
+            call_user_func(\Composer\Autoload\ComposerStaticInite833291eee48a309ec3057562bb8d92f::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,32 +4,28 @@
 
 namespace Composer\Autoload;
 
-<<<<<<< HEAD
-class ComposerStaticInit0e545bd79f2c55e11f645381af268f35
-=======
-class ComposerStaticInit048a628bc63e0bdd9ef175499008e74a
->>>>>>> parent of d57337a (NTR: Update dependencies)
+class ComposerStaticInite833291eee48a309ec3057562bb8d92f
 {
     public static $prefixLengthsPsr4 = array (
-        'M' => 
-        array (
-            'Mollie\\Api\\' => 11,
-        ),
-        'C' => 
-        array (
-            'Composer\\CaBundle\\' => 18,
-        ),
+        'M' =>
+            array (
+                'Mollie\\Api\\' => 11,
+            ),
+        'C' =>
+            array (
+                'Composer\\CaBundle\\' => 18,
+            ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'Mollie\\Api\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/mollie/mollie-api-php/src',
-        ),
-        'Composer\\CaBundle\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/composer/ca-bundle/src',
-        ),
+        'Mollie\\Api\\' =>
+            array (
+                0 => __DIR__ . '/..' . '/mollie/mollie-api-php/src',
+            ),
+        'Composer\\CaBundle\\' =>
+            array (
+                0 => __DIR__ . '/..' . '/composer/ca-bundle/src',
+            ),
     );
 
     public static $classMap = array (
@@ -39,15 +35,9 @@ class ComposerStaticInit048a628bc63e0bdd9ef175499008e74a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-<<<<<<< HEAD
-            $loader->prefixLengthsPsr4 = ComposerStaticInit0e545bd79f2c55e11f645381af268f35::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit0e545bd79f2c55e11f645381af268f35::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit0e545bd79f2c55e11f645381af268f35::$classMap;
-=======
-            $loader->prefixLengthsPsr4 = ComposerStaticInit048a628bc63e0bdd9ef175499008e74a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit048a628bc63e0bdd9ef175499008e74a::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit048a628bc63e0bdd9ef175499008e74a::$classMap;
->>>>>>> parent of d57337a (NTR: Update dependencies)
+            $loader->prefixLengthsPsr4 = ComposerStaticInite833291eee48a309ec3057562bb8d92f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInite833291eee48a309ec3057562bb8d92f::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInite833291eee48a309ec3057562bb8d92f::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -5,22 +5,18 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-<<<<<<< HEAD
-        'reference' => 'd57337a474be91eb695812139516ebe0d2896bf9',
-=======
-        'reference' => 'eb1e59ebd3be6954e77fef6b4050b751ca624321',
->>>>>>> parent of d57337a (NTR: Update dependencies)
+        'reference' => 'd8803f7aac626b79e60ad57e35ff4a77ce123360',
         'name' => 'mollie/shopware',
         'dev' => false,
     ),
     'versions' => array(
         'composer/ca-bundle' => array(
-            'pretty_version' => '1.4.0',
-            'version' => '1.4.0.0',
+            'pretty_version' => '1.5.1',
+            'version' => '1.5.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/./ca-bundle',
             'aliases' => array(),
-            'reference' => 'b66d11b7479109ab547f9405b97205640b17d385',
+            'reference' => '063d9aa8696582f5a41dffbbaf3c81024f0a604a',
             'dev_requirement' => false,
         ),
         'mollie/mollie-api-php' => array(
@@ -38,11 +34,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-<<<<<<< HEAD
-            'reference' => 'd57337a474be91eb695812139516ebe0d2896bf9',
-=======
-            'reference' => 'eb1e59ebd3be6954e77fef6b4050b751ca624321',
->>>>>>> parent of d57337a (NTR: Update dependencies)
+            'reference' => 'd8803f7aac626b79e60ad57e35ff4a77ce123360',
             'dev_requirement' => false,
         ),
     ),