Fix Test

modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
2014-07-04 14:49:35 +02:00
parent 169e236588
commit d82ca5d767
1 changed files with 4 additions and 0 deletions
--- a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
+++ b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
@@ -606,11 +606,15 @@ class ZipArchiveBuilderTest extends \PHPUnit_Framework_TestCase
    public function testBuildArchiveResponse()
    {
        $loadedArchiveResponse = $this->loadedZip
+<<<<<<< HEAD
 <<<<<<< HEAD
            ->buildArchiveResponse("test")
 =======
            ->buildArchiveResponse()
 >>>>>>> Define archive builders and formatters
+=======
+            ->buildArchiveResponse("test")
+>>>>>>> Fix Test
        ;

        $loadedArchiveResponseContent = $loadedArchiveResponse->getContent();