|
@@ -3,7 +3,11 @@
|
|
'name' => 'hyperf/hyperf-skeleton',
|
|
'name' => 'hyperf/hyperf-skeleton',
|
|
'pretty_version' => 'dev-master',
|
|
'pretty_version' => 'dev-master',
|
|
'version' => 'dev-master',
|
|
'version' => 'dev-master',
|
|
|
|
+<<<<<<< Updated upstream
|
|
'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
|
|
'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
|
|
|
|
+=======
|
|
|
|
+ 'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
|
|
|
|
+>>>>>>> Stashed changes
|
|
'type' => 'project',
|
|
'type' => 'project',
|
|
'install_path' => __DIR__ . '/../../',
|
|
'install_path' => __DIR__ . '/../../',
|
|
'aliases' => array(),
|
|
'aliases' => array(),
|
|
@@ -439,7 +443,11 @@
|
|
'hyperf/hyperf-skeleton' => array(
|
|
'hyperf/hyperf-skeleton' => array(
|
|
'pretty_version' => 'dev-master',
|
|
'pretty_version' => 'dev-master',
|
|
'version' => 'dev-master',
|
|
'version' => 'dev-master',
|
|
|
|
+<<<<<<< Updated upstream
|
|
'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
|
|
'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
|
|
|
|
+=======
|
|
|
|
+ 'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
|
|
|
|
+>>>>>>> Stashed changes
|
|
'type' => 'project',
|
|
'type' => 'project',
|
|
'install_path' => __DIR__ . '/../../',
|
|
'install_path' => __DIR__ . '/../../',
|
|
'aliases' => array(),
|
|
'aliases' => array(),
|