IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add merge bug

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-04-14 14:28:08 +00:00
parent a99f727eab
commit f6ddce2757
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
community_server/tests/Fixture/BaseTestFixture.php
View File

@ -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 = [];