From 9f1ff58480e82f143f54e5b746e1bdc4244f96f2 Mon Sep 17 00:00:00 2001
From: Bartek Szopka <bartek.szopka+github@gmail.com>
Date: Wed, 15 Feb 2012 21:28:21 +0100
Subject: [PATCH] conflict fix

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5edb9e0..105b94f 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,10 @@ VERSION HISTORY
 
 **CONTAINS UNRELEASED CHANGES, MAY BE UNSTABLE**
 
-<<<<<<< HEAD
 * minor CSS 3D fixes
-=======
 * basic API to control the presentation flow from JavaScript
 * touch event support
->>>>>>> api
+
 
 ### 0.2 ([browse](http://github.com/bartaz/impress.js/tree/0.2), [zip](http://github.com/bartaz/impress.js/zipball/0.2), [tar](http://github.com/bartaz/impress.js/tarball/0.2))