From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 29 Aug 2004 12:58:18 +0000 (+0000)
Subject: oops
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=96c22f710fa4295f9422a262a428d68105730411;p=fw%2Fsdcc

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 76630090..c465f921 100644
--- 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