From 97d2f503bd71b6c009632bdc50fd393c6803435f Mon Sep 17 00:00:00 2001 From: Leo Germani Date: Wed, 21 Feb 2018 14:09:34 -0300 Subject: [PATCH] fix conflict --- tests/test-api-collections.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test-api-collections.php b/tests/test-api-collections.php index 564742550..020646e9d 100644 --- 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(){