1

app/Controller/IndexController.php

@@ -26,3 +26,4 @@ class IndexController extends AbstractController
         // test
     }
 }
+// 111

vendor/composer/autoload_static.php

@@ -8,9 +8,9 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
 {
     public static $files = array (
         '9c7a683baffd24f5595c1dc5f5273030' => __DIR__ . '/..' . '/hyperf/engine/src/Functions.php',
-        'f0334cce41da231af374e1df9dc548c9' => __DIR__ . '/..' . '/hyperf/collection/src/Functions.php',
         '3ac0459b8c20ccf3a7319b7cba59c914' => __DIR__ . '/..' . '/hyperf/tappable/src/Functions.php',
         'e45471c4161dad9820dfacbc5735c3f5' => __DIR__ . '/..' . '/hyperf/stringable/src/Functions.php',
+        'f0334cce41da231af374e1df9dc548c9' => __DIR__ . '/..' . '/hyperf/collection/src/Functions.php',
         '6c17036e92b20070dc14f563311a06a3' => __DIR__ . '/..' . '/hyperf/coroutine/src/Functions.php',
         'ffe5873ab2256a6c3a4c92b3488528cb' => __DIR__ . '/..' . '/hyperf/support/src/Functions.php',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -333,8 +333,8 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-factory/src',
-            1 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-message/src',
+            1 => __DIR__ . '/..' . '/psr/http-factory/src',
         ),
         'Psr\\Http\\Client\\' => 
         array (

vendor/composer/installed.php

@@ -3,15 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-<<<<<<< HEAD
-        'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
-=======
-<<<<<<< Updated upstream
-        'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
-=======
-        'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
->>>>>>> Stashed changes
->>>>>>> web_sannong_fr
+        'reference' => 'e99260bc6b5c7f9f2ab123730145e1de7f769d20',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -465,15 +457,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-<<<<<<< HEAD
-            'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
-=======
-<<<<<<< Updated upstream
-            'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
-=======
-            'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
->>>>>>> Stashed changes
->>>>>>> web_sannong_fr
+            'reference' => 'e99260bc6b5c7f9f2ab123730145e1de7f769d20',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),