From e1b25f5bf2e1a067703d381d94e2478ce7baf8d0 Mon Sep 17 00:00:00 2001
From: Thomas Funk <t.funk@web.de>
Date: Thu, 9 Oct 2014 20:42:28 +0200
Subject: [PATCH] updated

---
 ChangeLog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 500e852..3ce7cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
 History:
-
-<<<<<<< HEAD
-10/20/2013 V 0.6.8
 =======
+
 10/09/2014 V 0.6.9
 - add fix from bstrik for issue #52 - FvwmIdent ColorSet 21 to the following
   colorsets: Air, Ambience and Tribal
@@ -38,7 +36,6 @@ History:
   - Converting of icons always to png
 
 10/20/2013
->>>>>>> master
 - update fvwm-nightshade help in asciidoc, man page and html
 - changes to fns-applications.menu:
   - add missing categories based on latest XDG menu spec