Home fix

1b10397d · Jansa Jose · 498e3e37 · 1b10397d
Commit 1b10397d authored 6 years ago by Jansa Jose
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Home.php application/controllers/Home.php +0 -3

No files found.
--- a/application/controllers/Home.php
+++ b/application/controllers/Home.php
@@ -983,7 +983,6 @@ class Home extends CI_Controller {

 			//print_r($data);

-<<<<<<< HEAD
 			$data['password'] = md5($data['password']);
 		
 			
@@ -991,8 +990,6 @@ class Home extends CI_Controller {
 			unset($data['month']);
 			unset($data['year']);

-=======
->>>>>>> jansa
 			//$this->Doctor_model->assignDoctors_default($this->session->userdata('UserData')['id'],'');

 			$result = $this->Home_model->register_doctor($data);