Merge problems fixing

2015-01-21 02:47:40 -08:00 · 2015-01-21 02:47:40 -08:00 · 3dcf48966a
commit 3dcf48966a
parent 7e2cdb1782 15ff62dbab
5 changed files with 12 additions and 11 deletions
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@ -3208,7 +3208,7 @@ namespace WebsitePanel.EnterpriseServer
                "GetOrganizationDeletedUser",
                new SqlParameter("@AccountID", accountId)
            );
-        }
+        }        

        public static IDataReader GetAdditionalGroups(int userId)
        {