From f5d44315d17ce93379e2c4576484f9033f285540 Mon Sep 17 00:00:00 2001
From: Greg Caldwell <caldwellgp@googlemail.com>
Date: Wed, 28 Jan 2015 23:52:54 +0000
Subject: [PATCH] Update README.markdown

---
 README.markdown | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.markdown b/README.markdown
index 5230e39..d7d030c 100755
--- a/README.markdown
+++ b/README.markdown
@@ -57,13 +57,8 @@ A typical project.xml file would look as follows. Each example in the away3d-exa
 	
 	
 ##Dependencies
-<<<<<<< HEAD
-Requires OpenFL 2.1.8
-    
-=======
 Requires OpenFL 2.2.4
 
->>>>>>> d88756b... Update to 1.1: Stage3D implementaion now migrated to OpenFL core library. Changes to support migration
 ##License
 
 Copyright 2014 The Away3D Team