From 66880d18112a34baa8193eb7fd297c94ef2bb4f7 Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Fri, 7 Mar 2014 12:25:07 -0300
Subject: [PATCH] dumb phone capable driver acceptance system #2477

---
 .../controllers/default/crunchbutton/api/twilio/driver.php    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/controllers/default/crunchbutton/api/twilio/driver.php b/include/controllers/default/crunchbutton/api/twilio/driver.php
index 01ad0b439..d7406f3da 100644
--- a/include/controllers/default/crunchbutton/api/twilio/driver.php
+++ b/include/controllers/default/crunchbutton/api/twilio/driver.php
@@ -13,7 +13,6 @@ class Controller_api_twilio_driver extends Crunchbutton_Controller_Rest {
 		$phone = str_replace( '+1', '', $_REQUEST[ 'From' ] );
 		$body = trim( $_REQUEST[ 'Body' ] );
 
-<<<<<<< HEAD
 		if( trim( $phone ) == '' ){
 			$this->adminError();
 			$this->log( [ 'action' => 'admin not found', 'phone' => $phone, 'body' => $body ] );
@@ -21,9 +20,6 @@ class Controller_api_twilio_driver extends Crunchbutton_Controller_Rest {
 		}
 
 		$admin = Admin::getByPhone( $phone );	
-=======
-		$admin = Admin::getByPhone( $phone );
->>>>>>> ca05cc9e3a1d1d30696e14442d2498f5eb3c6648
 
 		if( !$admin->id_admin ){
 			$this->adminError();