Fix

admin/application/models/Webservice_model.php

@@ -90,13 +90,7 @@ class Webservice_model extends CI_Model {
 			$data['complement'] = encrypt_data($data['complement']);
 			if($this->db->insert('tbl_doctors', $data)){
 				$insertid = $this->db->insert_id();
-<<<<<<< HEAD
 				$this->db->query("update tbl_doctors set dob = AES_ENCRYPT(".$data['dob'].",'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA')where id = ".$insertid);
-=======
-
-				$this->db->insert('tbl_clinic_doctors',array('doctor_id'=>$insertid,'clinic_id'=> 0));	
-				$this->db->insert('tbl_consultation',array('doctor_id'=>$insertid,'clinic_id'=> 0,'date'=>'""','date_secondary'=>'""','active_schedule'=> 0));
->>>>>>> jansa
 
 				$this->db->select('tbl_specialization.id as specialization_id,tbl_specialization.specialization_name,tbl_doctors.*');
 				$this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors.	specialization');