update

rafaelzamora · rafaelzamora · commit 1a1d35583297 · 2015-05-17T20:19:39.000-06:00
diff --git a/WebApplication1/MSSQLDataAccesService.asmx.cs b/WebApplication1/MSSQLDataAccesService.asmx.cs
@@ -203,10 +203,7 @@ public XmlDocument getPrivilege(string aUser, string aDataBase, string aPassword
 
 
         [WebMethod]
-        public XmlDocument getUsers (string aUser, string aDataBase, string aPassword)
-=======
         public XmlDocument getUsers(string aUser, string aDataBase, string aPassword)
->>>>>>> origin/master
         {
             prepareMSSQLConnectionString(aUser, aPassword, aDataBase);
 

Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,7 @@ public XmlDocument getPrivilege(string aUser, string aDataBase, string aPassword`
`203`	`203`
`204`	`204`
`205`	`205`	`[WebMethod]`
`206`		`- public XmlDocument getUsers (string aUser, string aDataBase, string aPassword)`
`207`		`-=======`
`208`	`206`	`public XmlDocument getUsers(string aUser, string aDataBase, string aPassword)`
`209`		`->>>>>>> origin/master`
`210`	`207`	`{`
`211`	`208`	`prepareMSSQLConnectionString(aUser, aPassword, aDataBase);`
`212`	`209`