~ chicken-core (chicken-5) 85105ef40050ab69fc09c872c39a340df8e1b7b4

commit 85105ef40050ab69fc09c872c39a340df8e1b7b4
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Feb 28 22:25:15 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Feb 28 22:25:15 2010 +0100

    resolved commit in lolevel.scm

diff --git a/lolevel.scm b/lolevel.scm
index ba422395..fa0445f4 100644
--- a/lolevel.scm
+++ b/lolevel.scm
@@ -1,10 +1,6 @@
 ;;;; lolevel.scm - Low-level routines for CHICKEN
 ;
-<<<<<<< HEAD:lolevel.scm
-; Copyright (c) 2008, The Chicken Team
-=======
 ; Copyright (c) 2008-2010, The Chicken Team
->>>>>>> master:lolevel.scm
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;