chris.watts90@outlook.com fa3a115c5c Finalized the merge.. ... Merge remote-tracking branch 'origin/CreateStaticFileHost' into UnbrokenSQLiteImplementation # Conflicts: # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Service1.cs # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj # DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/packages.config # DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/App.config # DataCenter_Windows/WindowsDataCenter/WindowsDataServiceHost/packages.config		2017-02-01 20:28:42 +00:00
..
WindowsDataCenter	Finalized the merge..	2017-02-01 20:28:42 +00:00