III-1962: Fix fatal error after incomplete merge

cultuurnet · Mar 22, 2017 · ed3c6e4 · ed3c6e4
1 parent d68c232
commit ed3c6e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
   ],
   "require": {
     "cultuurnet/hydra": "~0.1",
-    "cultuurnet/udb3-search": "dev-feature/III-1962 as 0.1",
+    "cultuurnet/udb3-search": "~0.1",
     "nicolopignatelli/valueobjects": "~3.0",
     "symfony/http-foundation": "~2.7.2"
   },

diff --git a/tests/OfferSearchControllerTest.php b/tests/OfferSearchControllerTest.php
@@ -93,16 +93,13 @@ public function it_returns_a_paged_collection_of_search_results_based_on_request
             )
             ->withMinimumAge(new Natural(3))
             ->withMaximumAge(new Natural(7))
-<<<<<<< HEAD
             ->withPrice(Price::fromFloat(1.55))
             ->withMinimumPrice(Price::fromFloat(0.99))
             ->withMaximumPrice(Price::fromFloat(1.99))
-=======
             ->withTextLanguages(
                 new Language('nl'),
                 new Language('en')
             )
->>>>>>> master
             ->withLabels(
                 new LabelName('foo'),
                 new LabelName('bar')