From 68a9c42d8ba3193d85c82ec3231948ae012068a9 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Fri, 29 Nov 2019 14:51:15 +0000 Subject: [PATCH] fix syntax error in Test Fixture --- tests/Fixture/TransactionCreationsFixture.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Fixture/TransactionCreationsFixture.php b/tests/Fixture/TransactionCreationsFixture.php index f7a281887..624d5771f 100644 --- a/tests/Fixture/TransactionCreationsFixture.php +++ b/tests/Fixture/TransactionCreationsFixture.php @@ -15,11 +15,7 @@ class TransactionCreationsFixture extends TestFixture */ // @codingStandardsIgnoreStart public $fields = [ -<<<<<<< HEAD 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], -======= - 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null], ->>>>>>> cd32fbe27a5e24b63a58d9b0b47c11917d31bcbc 'transaction_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], 'state_user_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], 'amount' => ['type' => 'biginteger', 'length' => 20, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],