From 56bfc4f75ad1b10056314218c75050b3fb6bb9ed Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 14 Mar 2018 20:23:40 +0100
Subject: [PATCH] TASK: Fix merge conflict issue

---
 .../Hooks/DataHandler/ProcessesAllowedTablesTest.php           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php b/Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php
index dff5f3b..279a113 100644
--- a/Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php
+++ b/Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php
@@ -73,7 +73,6 @@ class ProcessesAllowedTablesTest extends AbstractDataHandlerTest
      */
     public function updateWillBeTriggeredForExistingTtContent()
     {
-<<<<<<< HEAD
         $this->subject->expects($this->exactly(2))->method('update')
             ->withConsecutive(
                 [
@@ -98,7 +97,7 @@ class ProcessesAllowedTablesTest extends AbstractDataHandlerTest
                         return isset($record['uid']) && $record['uid'] === 1;
                     })
                 ]
-            });
+            );
 
         $tce = GeneralUtility::makeInstance(Typo3DataHandler::class);
         $tce->stripslashes_values = 0;