CRM 97.1%

5 years ago · e967fb1e66
parent 85453fd3d2
commit e967fb1e66
3 changed files with 2044 additions and 2035 deletions
--- a/.rnd
+++ b/.rnd
--- a/package-lock.json
+++ b/package-lock.json
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@ -1,14 +1,6 @@
 {
-<<<<<<< HEAD
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=46082928a20a61ffac98",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=2e3732fbd7feea17db64",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=148b27c08322ebf935a0",
-    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=9ef7b1af8b4a64d9d2cb",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=ad10046a6197a537f107"
-=======
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=6b97e64b88b473b78429",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=5cf42ee9bf28ccc49b35",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=7ff9b1d2a8dddd5e3d03",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=e0ac9d2216e187241d2a"
->>>>>>> refs/remotes/origin/master
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=97299021bb5d0a7cd97e",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=a7d0ac9d98d1ea2e9f4b",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=980523fc0cc2a57c5d11",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=c5b121cc1daee7862e6a"
 }