From 826a0c4e10c2737ef888d3782eb84cf66747b911 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@src.gnome.org>
Date: Sat, 13 Jul 2002 19:43:58 +0000
Subject: [PATCH] Removed a <<<< from Changelog

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 64f770c66..2e08921a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,7 +105,6 @@
 
 	* src/common.h: add a grab op for alt+esc window cycling
 
->>>>>>> 1.366
 2002-07-05  Havoc Pennington  <hp@pobox.com>
 
 	* src/themes/Makefile.am (THEMES): Take Gorilla out until it gets