fix conflict

2018-02-21 14:09:34 -03:00 · 2018-02-21 14:09:34 -03:00 · 97d2f503bd
parent 2bf300eeca
commit 97d2f503bd
1 changed files with 0 additions and 6 deletions
--- a/tests/test-api-collections.php
+++ b/tests/test-api-collections.php
@ -91,12 +91,6 @@ class TAINACAN_REST_Collections_Controller extends TAINACAN_UnitApiTestCase {
        
        $this->assertContains('testeApi', $collectionsNames);
        $this->assertContains('Other', $collectionsNames);
-
-<<<<<<< HEAD
-=======
-    	$this->assertEquals('Other', $one_collection['name']);
-    	$this->assertEquals('testeApi', $other_collection['name']);
->>>>>>> d3bb9a172b00dad430e8e9a04c2174d368b385e0
    }

    public function test_delete_or_trash_a_collection(){