From 28a00b98de04a151bea871c5f63a4ed7fcec9412 Mon Sep 17 00:00:00 2001
From: crunchy <crunchy>
Date: Fri, 18 Oct 2002 08:41:11 +0000
Subject: fixed ChangeLog

---
 ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index bc218c3..df96230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,19 +4,16 @@
 	functionality at the moment
 	(commands): removed completion for mpio files on the put command
 
-<<<<<<< ChangeLog
 2002-10-14  Andreas Buesching  <crunchy@tzi.de>
 
 	* mpiosh/global.c (commands): reactivated switch command without
 	any functionality at the moment
 
-=======
 2002-10-18  Markus Germeier  <mager@tzi.de>
 
 	* libmpio/directory.c (mpio_dentry_get_real): 
 	  another fix for the 8.3 handling needed for the config file
 
->>>>>>> 1.65
 2002-10-13  Markus Germeier  <mager@tzi.de>
 
 	* mpiosh/callback.c (mpiosh_cmd_dump): fixed compile and
-- 
cgit v1.2.3