From af5fa00c97530e3b92427ae9a8c5ef89f84ff3c3 Mon Sep 17 00:00:00 2001
From: Andrey Hristov <andrey@php.net>
Date: Thu, 10 Apr 2014 18:13:44 +0300
Subject: [PATCH] Fix the fix

---
 ext/mysqli/tests/mysqli_begin_transaction.phpt | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index c92e718d57..6c0508172f 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -120,16 +120,7 @@ if (!have_innodb($link))
 ?>
 --EXPECTF--
 NULL
-<<<<<<< HEAD
-[017] [1792] %s
-[018] invalid_flag = %d [%d]%A
 
 Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
 [019] [%d]%A
-[020] [%d]%A
-=======
-
-Warning: mysqli_begin_transaction(): Invalid value for parameter flags (-1) in %s on line %d
-[019] [%d]%A
->>>>>>> 3204ad5858a5abc50b11b8527d22c82eb07a80cc
 done!
\ No newline at end of file
-- 
2.40.0