Update WinkServiceProvider.php

frknasir · Oct 14, 2020 · 491b776 · 491b776
1 parent d324406
commit 491b776
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/WinkServiceProvider.php b/src/WinkServiceProvider.php
@@ -109,7 +109,7 @@ public function register()
  Console\MigrateCommand::class,
  ]);
  }
-<<<<<<< HEAD
+
 
  /**
  * Return the subdomain if configured.
@@ -127,6 +127,4 @@ protected function subdomain($subdomain)
  parse_url(config('app.url'), PHP_URL_HOST),
  ]);
  }
-=======
->>>>>>> 1.x
 }