install package moment

package.json

@@ -23,10 +23,13 @@
         "chart.js": "^2.7.3",
         "graphql": "^14.4.2",
         "graphql-tag": "^2.10.1",
+        "jalali-moment": "^3.3.3",
         "loadash": "^1.0.0",
         "vue-apexcharts": "^1.4.0",
         "vue-apollo": "^3.0.0-alpha.3",
         "vue-chartjs": "^3.4.0",
+        "vue-jalali-moment": "^1.0.0",
+        "vue-moment": "^4.0.0",
         "vue-router": "^3.0.2",
         "vue-scroll-reveal": "^1.0.11",
         "vuetify": "^1.5.14"

public/mix-manifest.json

@@ -1,14 +1,6 @@
 {
-<<<<<<< HEAD
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=126dc6f3c173336b3c08",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=bf18112bfd001430c068",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=79f8aa6edff8ead412ae",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=c7a4038bfe7a736076b0",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=c02efa86f7529baae7b3",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=201a6bfbd9ddca9ca2a3"
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=7096cbe1285511bfa614"
-=======
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=dd71ece093627ceeb8e0",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=ed85fe3b61f308dc2e8c",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=c021095f6e5e00a81073",
-    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=5f408f2fd973ffba7cae",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=442c17b05e9f1943a1ed"
->>>>>>> 71a967996bf3bf5250f295639720323318ca4fcc
 }