合并冲突处理

SooonerHotel/App/Lib/Action/System/UserAction.class.php

@@ -112,9 +112,7 @@ class UserAction extends CommonAction{
             $user["secret"]=$secret;
 			
 			$uid = $UserModel->add($user);
-<<<<<<< HEAD
-//            echo $UserModel->getLastSql();
-=======
+
             
             $SpUserMapModel->where("user_id = $uid")->delete();
             if($sp_ids){
@@ -125,7 +123,6 @@ class UserAction extends CommonAction{
                 $SpUserMapModel->addAll($mapData);
             }
             
->>>>>>> 980ee345f9634e1754770ec7a03395b1e371512d
 			if($uid){
 				$role["role_id"]=I("role_id","",int);
 				$role["user_id"]=$uid;