bwj

KentYuan · Nov 18, 2013 · 87fab25 · 87fab25
1 parent cf43b81
commit 87fab25
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/baby/src/com/keju/baby/activity/doctor/DoctorCreatBabyAccountActivity.java b/baby/src/com/keju/baby/activity/doctor/DoctorCreatBabyAccountActivity.java
@@ -14,11 +14,9 @@
  * @author Zhoujun
  * @version 创建时间：2013-10-25 下午2:57:49
  */
-<<<<<<< HEAD
-public  class DoctorCreatBabyAccountActivity extends BaseActivity implements OnClickListener{
-=======
+
 public class DoctorCreatBabyAccountActivity extends BaseActivity implements OnClickListener{
->>>>>>> c2fdf89873679aa485b607e14adc2fc720661ce1
+
 	private Button btnLeft,btnRight;
 	private TextView tvTitle;
 	protected void onCreate(Bundle savedInstanceState) {