Removed a <<<< from Changelog

This commit is contained in:
Christophe Fergeau 2002-07-13 19:43:58 +00:00
parent ebb788140a
commit 826a0c4e10

View File

@ -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