summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d70eee806c..07c9cc0791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
Tue May 27 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.