Remove Conflicts

sugarcrm · Jun 6, 2017 · 0c403a5 · 0c403a5
2 parents 527dfa0 + e9fa22b
commit 0c403a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 .idea/
 vendor/
 composer.lock
-coverage/
+coverage/
diff --git a/tests/Helpers/HelpersTest.php b/tests/Helpers/HelpersTest.php
@@ -79,7 +79,6 @@ public function testConfigureAPIUrl()
         $this->assertEquals('http://localhost/Sugar/Test/rest/v10/',Helper::configureAPIURL('http://localhost/Sugar/Test/rest/v10/rest/v10/rest/v10','10'));
         $this->assertEquals('http://localhost/SugarTest/rest/v10/',Helper::configureAPIURL('http://localhost/SugarTest/rest/v10/rest/v10/rest/v10',10));
         $this->assertEquals('http://localhost/SugarTest/rest/v11/',Helper::configureAPIURL('http://localhost/SugarTest/rest/v10/rest/v10/rest/v10',11));
-
     }
 
 }