Bump version to 0.0.8

wooga · Feb 25, 2015 · 3917ef9 · 3917ef9
1 parent 56f1d35
commit 3917ef9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/build.sh b/build.sh
diff --git a/src/Paket.Unity3D.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Unity3D.Bootstrapper/Properties/AssemblyInfo.cs
@@ -4,10 +4,10 @@
 [assembly: AssemblyTitleAttribute("Paket.Unity3D.Bootstrapper")]
 [assembly: AssemblyProductAttribute("Paket.Unity3D")]
 [assembly: AssemblyDescriptionAttribute("Piggy-backs ontop of Paket to add dependencies to Unity3D projects")]
-[assembly: AssemblyVersionAttribute("0.0.6")]
-[assembly: AssemblyFileVersionAttribute("0.0.6")]
+[assembly: AssemblyVersionAttribute("0.0.8")]
+[assembly: AssemblyFileVersionAttribute("0.0.8")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.0.6";
+        internal const string Version = "0.0.8";
     }
 }
diff --git a/src/Paket.Unity3D/AssemblyInfo.fs b/src/Paket.Unity3D/AssemblyInfo.fs
@@ -4,18 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Paket.Unity3D")>]
 [<assembly: AssemblyProductAttribute("Paket.Unity3D")>]
 [<assembly: AssemblyDescriptionAttribute("Piggy-backs ontop of Paket to add dependencies to Unity3D projects")>]
-<<<<<<< HEAD
-[<assembly: AssemblyVersionAttribute("0.0.6")>]
-[<assembly: AssemblyFileVersionAttribute("0.0.6")>]
+[<assembly: AssemblyVersionAttribute("0.0.8")>]
+[<assembly: AssemblyFileVersionAttribute("0.0.8")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.0.6"
-=======
-[<assembly: AssemblyVersionAttribute("0.0.7")>]
-[<assembly: AssemblyFileVersionAttribute("0.0.7")>]
-do ()
-
-module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.0.7"
->>>>>>> edf73816178a230ab27b3f97f5fe27b22c770b1d
+    let [<Literal>] Version = "0.0.8"