fix

composer.json

@@ -21,6 +21,8 @@
         "wm/common": "dev-master",
         "wm/core": "dev-master",
         "wm/crm": "dev-master",
+        "wm/product": "dev-dev",
+        "wm/web-builder": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -87,33 +89,16 @@
             "url": "./modules/wm-core"
         },
         {
-<<<<<<< HEAD
             "type": "path",
             "url": "./modules/wm-admin"
-=======
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git"
         },
         {
-            "type": "vcs",
+            "type": "path",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git"
+            "url": "./modules/wm-web-builder"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
         },
 	{
-            "type": "vcs",
+		"type": "path",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/admin.git"
+		"url" : "./modules/wm-product"
->>>>>>> f00eeb32412778309921d776485bbd0c9f7d7fdf
 	}
     ]
 }

resources/js/Home/views/AddModule.vue

@@ -101,20 +101,9 @@
 
 
 <script>
-<<<<<<< HEAD
-// import ModuleItems from "@Admin/components/Client/Module/Items.vue";
-import { mapGetters, mapActions, mapMutations } from "vuex";
-export default {
-	components: {
-        // ModuleItems,
-=======
 //import ModuleItems from "@Admin/components/Client/Module/Items.vue";
 import { mapGetters, mapActions, mapMutations } from "vuex";
 export default {
-	components: {
-      //  ModuleItems,
->>>>>>> f00eeb32412778309921d776485bbd0c9f7d7fdf
-	},
 	data() {
 		return {
 			breadcrumbItems: [

webpack.mix.js

@@ -37,26 +37,8 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
 require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
 require('./modules/wm-crm/webpack.mix');
-<<<<<<< HEAD
 require('./modules/wm-admin/webpack.mix');
-// require('./modules/wm-blog/webpack.mix');
+require('./modules/wm-web-builder/webpack.mix');
-// require('./modules/wm-portfolio/webpack.mix');
-// require('./modules/wm-finance/webpack.mix');
-// require('./modules/wm-product/webpack.mix');
-// require('./modules/wm-service/webpack.mix');
-// require('./modules/wm-store/webpack.mix');
-// require('./modules/wm-warehouse/webpack.mix');
-=======
-require('./modules/wm-blog/webpack.mix');
-require('./modules/wm-portfolio/webpack.mix');
-require('./modules/wm-finance/webpack.mix');
 require('./modules/wm-product/webpack.mix');
-require('./modules/wm-service/webpack.mix');
-require('./modules/wm-store/webpack.mix');
-require('./modules/wm-warehouse/webpack.mix');
-require('./modules/wm-admin/webpack.mix');
->>>>>>> f00eeb32412778309921d776485bbd0c9f7d7fdf
-// require('./modules/wm-web-builder/webpack.mix');
-// require('./modules/wm-reservation/webpack.mix');
 
 mix.version();