From d82ca5d7673b873090b2ae15ebe64cb31c4f8139 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Fri, 4 Jul 2014 14:49:35 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20Test=20=09modifi=C3=A9:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilde?=
 =?UTF-8?q?r/ZipArchiveBuilderTest.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Archive/ArchiveBuilder/ZipArchiveBuilderTest.php          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php b/core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
index fa8ea74d1..f0c6b2385 100644
--- 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();