~ chicken-core (chicken-5) 1cb9220ce48eb4512ccc47507a12f76fdb82615e

commit 1cb9220ce48eb4512ccc47507a12f76fdb82615e
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Sep 14 15:21:44 2010 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Sep 14 15:21:44 2010 +0200

    removed conflict markers

diff --git a/version.scm b/version.scm
index 440550ae..70abb6e4 100644
--- a/version.scm
+++ b/version.scm
@@ -1,5 +1 @@
-<<<<<<< HEAD:version.scm
-(define-constant +build-version+ "4.6.0")
-=======
 (define-constant +build-version+ "4.6.1")
->>>>>>> experimental:version.scm