migration and seeder in seccsesfullt

.idea/php.xml

@@ -147,4 +147,9 @@
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
+    </phpunit_settings>
+  </component>
 </project>

composer.json

@@ -12,16 +12,9 @@
         "coraxster/flysystem-aws-s3-v3-minio": "^1.0",
         "fideloper/proxy": "^4.0",
         "kalnoy/nestedset": "^5.0",
-<<<<<<< HEAD
         "laravel/framework": "^8.0",
         "laravel/passport": "^10",
         "laravel/tinker": "^2.0",
-=======
-        "laravel/framework": "^6.2",
-        "laravel/passport": "^7.3",
-        "laravel/tinker": "^1.0",
-        "lcobucci/jwt": "3.3.3",
->>>>>>> dev
         "maatwebsite/excel": "^3.1",
         "spatie/laravel-medialibrary": "^8.0.0",
         "wm/blog": "dev-master",

storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6

@@ -1 +1 @@
-1606834072i:1606834072;
+1606918511i:1606918511;

storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c

@@ -1 +1 @@
-1606834072i:1;
+1606918511i:2;