Confilict fix

yedincisenol · Aug 10, 2018 · 1289efe · 1289efe
1 parent 4305582
commit 1289efe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/Vision.php b/src/Vision.php
@@ -7,7 +7,6 @@
 
 class Vision extends VisionClient
 {
-<<<<<<< HEAD
     public function annotate(Image $image, array $options = [])
     {
         if (!key_exists('api_key', $options)) {
@@ -17,6 +16,3 @@ public function annotate(Image $image, array $options = [])
         return parent::annotate($image, $options);
     }
 }
-=======
-}
->>>>>>> 16b2f98206c5c73f86b31d9dafaaf8840567c3cf
diff --git a/src/config.php b/src/config.php
@@ -1,11 +1,6 @@
 <?php
 
 return [
-<<<<<<< HEAD
     'credentials_path'   =>  env('VISION_CREDENTIALS_PATH'),
 	'api_key'			 =>	 env('VISION_API_KEY')
-];
-=======
-    'credentials_path'   => env('VISION_CREDENTIALS_PATH'),
-];
->>>>>>> 16b2f98206c5c73f86b31d9dafaaf8840567c3cf
+];