diff --git a/.gitignore b/.gitignore
index 873811e..692ff0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 Thumbs.db
+*.exe
+*.pdb
 *.obj
 *.user
 *.aps

diff --git a/.gitignore b/.gitignore
index 873811e..692ff0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 Thumbs.db
+*.exe
+*.pdb
 *.obj
 *.user
 *.aps
diff --git a/FrmLogin.cs b/FrmLogin.cs
index 7f6558b..18ea2b5 100644
--- a/FrmLogin.cs
+++ b/FrmLogin.cs
@@ -129,11 +129,8 @@
         private bool ValidateUser()
         {
             string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim());           
-<<<<<<< HEAD
             string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'";
-=======
-            string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname = 'EMS'";
->>>>>>> 8f03f60481c29c2ba08e413f672112865391c69c
+
             
             DataTable dt = OledbHelper.QueryTable(sql);
             if (dt != null && dt.Rows.Count > 0)

diff --git a/.gitignore b/.gitignore
index 873811e..692ff0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 Thumbs.db
+*.exe
+*.pdb
 *.obj
 *.user
 *.aps
diff --git a/FrmLogin.cs b/FrmLogin.cs
index 7f6558b..18ea2b5 100644
--- a/FrmLogin.cs
+++ b/FrmLogin.cs
@@ -129,11 +129,8 @@
         private bool ValidateUser()
         {
             string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim());           
-<<<<<<< HEAD
             string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'";
-=======
-            string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' and sysname = 'EMS'";
->>>>>>> 8f03f60481c29c2ba08e413f672112865391c69c
+
             
             DataTable dt = OledbHelper.QueryTable(sql);
             if (dt != null && dt.Rows.Count > 0)
diff --git a/bin/x86/Debug/login.xml b/bin/x86/Debug/login.xml
index 82b3a7d..f0c6848 100644
--- a/bin/x86/Debug/login.xml
+++ b/bin/x86/Debug/login.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
-<<<<<<< HEAD
+
   <username>liuyeming</username>
   <password>liuyeming123</password>
-=======
-  <username>yewei</username>
-  <password>yewei123</password>
->>>>>>> 8f03f60481c29c2ba08e413f672112865391c69c
+
   <isremember>true</isremember>
 </Params>
\ No newline at end of file