From f6ddce27570d4cf5cbc31ee0a12f1bf2c34fb549 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Wed, 14 Apr 2021 14:28:08 +0000
Subject: [PATCH] add merge bug

---
 community_server/tests/Fixture/BaseTestFixture.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/community_server/tests/Fixture/BaseTestFixture.php b/community_server/tests/Fixture/BaseTestFixture.php
index 27eb36989..1f63aa55e 100644
--- a/community_server/tests/Fixture/BaseTestFixture.php
+++ b/community_server/tests/Fixture/BaseTestFixture.php
@@ -13,11 +13,7 @@ use Cake\TestSuite\Fixture\TestFixture;
 class BaseTestFixture extends TestFixture
 {
     // after copy from sql export, replace all hex values to hex strings with regExp (z.B. within Netbeans)
-<<<<<<< HEAD
-    // ''([0-9a-f]*) => '$1'
-=======
     // 0x([0-9a-f]*) => '$1'
->>>>>>> 33d751edaa339bca5a33ee873d2f00453dd0545a
     protected function sqlEntrysToRecords($sql_entries, $fields) {
         $field_array_keys = array_keys($fields);
         $records = [];