From 892c9cfd4cdb65f695b70e2616fb5be70976c4ad Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 19 Aug 2010 14:14:49 +0000 Subject: [PATCH] Fixed version file Monotone-Parent: f4817b8a1de11dfe8fbb52901c26650b7d23b160 Monotone-Revision: 5023b99b30755688cc4fc864ca034ae7966b1af9 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-08-19T14:14:49 --- UI/MainUI/Version | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/UI/MainUI/Version b/UI/MainUI/Version index 458cc5adb..4010e5dd4 100644 --- a/UI/MainUI/Version +++ b/UI/MainUI/Version @@ -1,13 +1,3 @@ # Version file -<<<<<<< variant A SUBMINOR_VERSION:=1 - -# v0.9.1 requires Main v0.9.59 ->>>>>>> variant B -SUBMINOR_VERSION:=1 -####### Ancestor -SUBMINOR_VERSION:=0 - -# v0.9.1 requires Main v0.9.59 -======= end