Beta V.1.1.1

rendiputra · Nov 17, 2020 · ed1339d · ed1339d
2 parents c858e5f + 8728b33
commit ed1339d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/readme.md b/readme.md
@@ -41,4 +41,8 @@ $ php artisan key:generate
 $ php artisan jwt:generate
 $ php artisan serve
 ```
-**Dan jangan lupa untuk dump DB file sqlnya**
+<<<<<<< HEAD
+**Dan jangan lupa untuk dump DB file sqlnya**
+=======
+**Dan jangan lupa untuk dump DB file sqlnya**
+>>>>>>> 8728b33b7add8cef271d6cd6efb9ff69dfc03cba