From ad74bdcea9ac1795bea6258fc2353a6ff697a4fc Mon Sep 17 00:00:00 2001 From: George Pantazis Date: Mon, 30 Apr 2012 20:28:04 +0300 Subject: [PATCH] Fix for merge issue with AssemblyInfo.cs. Signed-off-by: George Pantazis --- trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs index a040480..9246bf5 100644 --- 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")] -- 1.7.10.4