Manually edited Version

[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 b6e5f90..826915d 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -92,12 +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.*")]
-[assembly: AssemblyVersion("0.7.20427.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20427.0")]
-=======
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.7.20430.0")]
 [assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
->>>>>>> 1865ad904d16c957b461d4f539cd762dfaf29dae