Fixup.

drunkcod · Mar 6, 2017 · c2311fc · c2311fc
1 parent bdc968b
commit c2311fc
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/Source/Version.cs b/Source/Version.cs
@@ -1,11 +1,6 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
-<<<<<<< HEAD
-[assembly: AssemblyVersion("2017.1.17.1")]
-[assembly: AssemblyInformationalVersion("2017.01.13")]
-=======
 [assembly: AssemblyVersion("2017.3.6.1")]
 [assembly: AssemblyInformationalVersion("2017.03.06")]
->>>>>>> a64d261... Let's go with that then.