dc

application/models/Api_model.php

@@ -1770,15 +1770,8 @@ class Api_model extends CI_Model {
 					    FROM checker_bookings AS CBOOK
 					    INNER JOIN checker AS CHK ON (CHK.id=$checker_id)
 					    INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
-<<<<<<< HEAD
-					    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id AND 
-					    							 EVT.provider_id=CHK.provider_id)
-					    WHERE CBOOK.checker_id='$checker_id' AND BOOK.status='1'";
-=======
 					    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
 					    WHERE EVT.provider_id=CHK.provider_id AND BOOK.status='1'";
-					    pr($sql);
->>>>>>> 35e64468038d7469ca02c0914cd0daa42d2399e4
  				$count = $this->db->query($sql)->num_rows();
 
  				if($count > 0) {