From ec7735b487b3c80804079c47953c0a3184c1050d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (laptop)" <j.wuttke@fz-juelich.de>
Date: Tue, 22 Feb 2011 09:05:07 +0100
Subject: [PATCH] merged

---
 pub/CHANGELOG | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index da040052..21e01340 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,12 +1,9 @@
-<<<<<<< HEAD:pub/CHANGELOG
 Release 2.1.3a
 
 - interface changes:
   - command modifier "=" (overwrite) must now be appended
   - calculator mode merged with main menu: FRIDA _is_ now a pocket calculator
 
-=======
->>>>>>> a727e4ea782628774cb72719f1fc30b59795a9d7:pub/CHANGELOG
 Release 2.1.2a of 20feb11:
 
 - new functionality:
-- 
GitLab