Fix for merge issue with AssemblyInfo.cs.

[pithos-ms-client] / trunk / Pithos.Client.WPF / Properties / AssemblyInfo.cs

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index a040480..9246bf5 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -92,9 +92,6 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-<<<<<<< HEAD
 // [assembly: AssemblyVersion("1.0.*")]
-=======
->>>>>>> 2b0ec5b83deb6c61ffae7943da4606733b0f5e76
-[assembly: AssemblyVersion("0.7.20430.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
+[assembly: AssemblyVersion("0.7.20431.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20431.0")]