|
@@ -3,7 +3,11 @@
|
|
|
'name' => 'hyperf/hyperf-skeleton',
|
|
|
'pretty_version' => 'dev-master',
|
|
|
'version' => 'dev-master',
|
|
|
+<<<<<<< HEAD
|
|
|
'reference' => '4bdced194db9377c80023b13d9edf9b6bc342d41',
|
|
|
+=======
|
|
|
+ 'reference' => '452c3aad61513066c145fd9a77d1bae540191494',
|
|
|
+>>>>>>> 20241213_fr_diyweb
|
|
|
'type' => 'project',
|
|
|
'install_path' => __DIR__ . '/../../',
|
|
|
'aliases' => array(),
|
|
@@ -439,7 +443,11 @@
|
|
|
'hyperf/hyperf-skeleton' => array(
|
|
|
'pretty_version' => 'dev-master',
|
|
|
'version' => 'dev-master',
|
|
|
+<<<<<<< HEAD
|
|
|
'reference' => '4bdced194db9377c80023b13d9edf9b6bc342d41',
|
|
|
+=======
|
|
|
+ 'reference' => '452c3aad61513066c145fd9a77d1bae540191494',
|
|
|
+>>>>>>> 20241213_fr_diyweb
|
|
|
'type' => 'project',
|
|
|
'install_path' => __DIR__ . '/../../',
|
|
|
'aliases' => array(),
|