diff --git a/composer.lock b/composer.lock
index 7c48e53..3789157 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1072,12 +1072,21 @@
"source": {
"type": "git",
"url": "https://github.com/nuwave/lighthouse.git",
+<<<<<<< HEAD
"reference": "724b36194a547bb29835481b1604c320afc59cb9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/724b36194a547bb29835481b1604c320afc59cb9",
"reference": "724b36194a547bb29835481b1604c320afc59cb9",
+=======
+ "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/d1263bfa64457df82e05f309e3920313ec8ac6e1",
+ "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1",
+>>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0
"shasum": ""
},
"require": {
@@ -1148,7 +1157,11 @@
"laravel",
"laravel-graphql"
],
+<<<<<<< HEAD
"time": "2019-07-19T09:52:35+00:00"
+=======
+ "time": "2019-07-16T17:36:18+00:00"
+>>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0
},
{
"name": "nwidart/laravel-modules",
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index 69ffdd0..633626a 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -20,6 +20,10 @@ type User {
cell_number: String
}
+input CreateUserRelationInput {
+ connect: ID!
+}
+
input DateRange {
from: Date!
to: Date!
@@ -27,4 +31,5 @@ input DateRange {
#import ../modules/wm-crm/graphql/CRM.graphql
#import ../modules/wm-core/graphql/Core.graphql
+#import ../modules/wm-common/graphql/Common.graphql
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ab384be..b6cf71e 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,13 @@
{
+<<<<<<< HEAD
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=2eae82d3fa71f897e604",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=e0ff24444a4741972c82",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=40d15556cfb075cca358",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=47c003e1714e1da1fa59"
+=======
+ "/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/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=59b1f7ca2c06f4958f2e",
+ "/js/vue/User/app.js": "/js/vue/User/app.js?id=5ec6720cc9a709374d5e"
+>>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0
}
diff --git a/resources/js/Global/components/Misc/Breadcrumbs.vue b/resources/js/Global/components/Misc/Breadcrumbs.vue
index 317186b..b8edd9b 100644
--- a/resources/js/Global/components/Misc/Breadcrumbs.vue
+++ b/resources/js/Global/components/Misc/Breadcrumbs.vue
@@ -4,7 +4,7 @@