Merge branch 'electronChanges' of github.com:killzoms/Nitrox into ele…

…ctronChanges
SubnauticaNitrox · Jun 13, 2020 · 9a39411 · 9a39411
2 parents eb9b088 + de662bd
commit 9a39411
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Nitrox.sln b/Nitrox.sln
@@ -1,7 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
+<<<<<<< HEAD
 VisualStudioVersion = 16.0.30114.105
+=======
+VisualStudioVersion = 16.0.30011.22
+>>>>>>> de662bd2fa40e57ce8814582be8bdee11a1f8cb1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NitroxServer", "NitroxServer\NitroxServer.csproj", "{0FC864B0-694E-4FCA-B78C-8EF98BC6F262}"
 EndProject