1

vendor/composer/autoload_classmap.php

@@ -20,20 +20,9 @@ return array(
     'App\\Model\\Category' => $baseDir . '/app/Model/Category.php',
     'App\\Model\\Link' => $baseDir . '/app/Model/Link.php',
     'App\\Model\\Model' => $baseDir . '/app/Model/Model.php',
-<<<<<<< HEAD
-    'App\\Model\\OldModel\\Article' => $baseDir . '/app/Model/OldModel/Article.php',
     'App\\Model\\Web' => $baseDir . '/app/Model/Web.php',
     'App\\Model\\Website' => $baseDir . '/app/Model/Website.php',
     'App\\Model\\WebsiteCategory' => $baseDir . '/app/Model/WebsiteCategory.php',
-=======
-<<<<<<< HEAD
-    'App\\Model\\Website' => $baseDir . '/app/Model/Website.php',
-=======
-    'App\\Model\\Web' => $baseDir . '/app/Model/Web.php',
-    'App\\Model\\Website' => $baseDir . '/app/Model/Website.php',
-    'App\\Model\\WebsiteCategory' => $baseDir . '/app/Model/WebsiteCategory.php',
->>>>>>> web_sannong_fr
->>>>>>> 5d2b048db54fda63469be0b375e13f29d2f5af93
     'App\\Model\\WebsiteColumn' => $baseDir . '/app/Model/WebsiteColumn.php',
     'App\\Model\\WebsiteRole' => $baseDir . '/app/Model/WebsiteRole.php',
     'App\\Model\\WebsiteRoleUser' => $baseDir . '/app/Model/WebsiteRoleUser.php',

vendor/composer/autoload_static.php

@@ -704,20 +704,9 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\Category' => __DIR__ . '/../..' . '/app/Model/Category.php',
         'App\\Model\\Link' => __DIR__ . '/../..' . '/app/Model/Link.php',
         'App\\Model\\Model' => __DIR__ . '/../..' . '/app/Model/Model.php',
-<<<<<<< HEAD
-        'App\\Model\\OldModel\\Article' => __DIR__ . '/../..' . '/app/Model/OldModel/Article.php',
         'App\\Model\\Web' => __DIR__ . '/../..' . '/app/Model/Web.php',
         'App\\Model\\Website' => __DIR__ . '/../..' . '/app/Model/Website.php',
         'App\\Model\\WebsiteCategory' => __DIR__ . '/../..' . '/app/Model/WebsiteCategory.php',
-=======
-<<<<<<< HEAD
-        'App\\Model\\Website' => __DIR__ . '/../..' . '/app/Model/Website.php',
-=======
-        'App\\Model\\Web' => __DIR__ . '/../..' . '/app/Model/Web.php',
-        'App\\Model\\Website' => __DIR__ . '/../..' . '/app/Model/Website.php',
-        'App\\Model\\WebsiteCategory' => __DIR__ . '/../..' . '/app/Model/WebsiteCategory.php',
->>>>>>> web_sannong_fr
->>>>>>> 5d2b048db54fda63469be0b375e13f29d2f5af93
         'App\\Model\\WebsiteColumn' => __DIR__ . '/../..' . '/app/Model/WebsiteColumn.php',
         'App\\Model\\WebsiteRole' => __DIR__ . '/../..' . '/app/Model/WebsiteRole.php',
         'App\\Model\\WebsiteRoleUser' => __DIR__ . '/../..' . '/app/Model/WebsiteRoleUser.php',

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '2d74f709d7ba0f8dac5e7fc688710ed24bf12f0e',
+        'reference' => '514e140ced1c08bca0b32bb92fddaac6096c2149',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -439,7 +439,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '2d74f709d7ba0f8dac5e7fc688710ed24bf12f0e',
+            'reference' => '514e140ced1c08bca0b32bb92fddaac6096c2149',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),