~ chicken-core (chicken-5) 1e3d20de85da3a4e1a633c3e38324ad77bd5eb20

commit 1e3d20de85da3a4e1a633c3e38324ad77bd5eb20
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sun Sep 11 22:21:07 2016 +0200
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Sep 11 22:21:07 2016 +0200

    Missed one more merge conflict marker

diff --git a/README b/README
index 1ff7433d..70f12e48 100644
--- a/README
+++ b/README
@@ -6,11 +6,7 @@
   (c) 2008-2015, The CHICKEN Team
   (c) 2000-2007, Felix L. Winkelmann
 
-<<<<<<< HEAD
-  version 4.9.1
-=======
-  version 4.11.2
->>>>>>> 0012ce0... Bump version to 4.11.2
+  version 5.0.0
 
 
  1. Introduction