src-php/test/internship/controller/ArticleControllerTest.php

@@ -6,14 +6,11 @@ use PHPUnit\Framework\TestCase;
 use n2n\test\TestEnv;
 use internship\test\ArticleTestEnv;
 use util\GeneralTestEnv;
-<<<<<<< HEAD
 use n2n\web\http\StatusException;
 
-=======
 use n2n\web\http\PageNotFoundException;
 use internship\bo\Article;
 use n2n\web\http\BadRequestException;
->>>>>>> 2a18d34 (Aufgaben)
 
 class ArticleControllerTest extends TestCase {
 
@@ -43,14 +40,8 @@ class ArticleControllerTest extends TestCase {
 				->get(['api', 'articles'])
 				->exec();
 
-<<<<<<< HEAD
-		$articleStructs = $response->parseJson();
-
-		$this->assertCount(3, $articleStructs);
-=======
 		$articleStruct = $response->parseJson();
 		$this->assertCount(3, $articleStruct);
->>>>>>> 2a18d34 (Aufgaben)
 
 		$this->assertEquals('Title 3', $articleStruct[0]['title']);
 		$this->assertEquals('Title 2', $articleStruct[1]['title']);
@@ -256,8 +247,5 @@ class ArticleControllerTest extends TestCase {
 
 	}
 
-	function testGetDoArticle() {
-
-	}
 
 }