oops

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3461 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 76630090aeb997dacfba66388948ff18e053373a..c465f921153e12ea8a743280a23a7d1039731aa7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,6 @@
        * device/lib/_mullong.c: defined an alternate struct layout for big
        endian ports (hc08)
 
->>>>>>> 1.812
 2004-08-28 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
 
        * src/hc08/gen.c (shiftL2Left2Result): fix for bug-500536 regression