Fixed sytax error in pdo driver

1 files changed, 0 insertions, 4 deletions

diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 5f63a3771..18a508b15 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -255,11 +255,7 @@ class CI_DB_pdo_driver extends CI_DB {
 		// Reset the transaction failure flag.
 		// If the $test_mode flag is set to TRUE transactions will be rolled back
 		// even if the queries produce a successful result.
-<<<<<<< HEAD
-		$this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE;
-=======
 		$this->_trans_failure = (bool) ($test_mode === TRUE);
->>>>>>> master
 
 		return $this->conn_id->beginTransaction();
 	}