1 files changed, 1 insertions, 5 deletions

diff --git a/README b/README
index e5053509..6e31ab6e 100644
--- a/README
+++ b/README
@@ -1,11 +1,7 @@
 AETHYRA
 ===================
 
-<<<<<<< HEAD:README
- Version: 0.0.25    Date: 9/16/2008
-=======
- Version: 0.0.26    Date: 29/8/2008
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:README
+ Version: 0.0.27    Date: 12/07/2008
 
  Development team:
   - See AUTHORS file for a list