From f49e29bf84ebb1e2fcab90d17daa22d787d809ac Mon Sep 17 00:00:00 2001
From: cmhtcleo <cmhtcleo@gmail.com>
Date: Mon, 24 Oct 2011 22:21:16 +0200
Subject: [PATCH] leo: fix postrecoveryboot.sh

---
 postrecoveryboot.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/postrecoveryboot.sh b/postrecoveryboot.sh
index dce0ea5..d65a5ff 100755
--- a/postrecoveryboot.sh
+++ b/postrecoveryboot.sh
@@ -14,7 +14,3 @@ fi
 #cat >> /etc/fstab << EOF
 #/dev/block/mmcblk0p2 /sd-ext $FS rw
 #EOF
-<<<<<<< HEAD
-=======
-
->>>>>>> 40364b7f71c1fadc944e913c7577b31132cf0a65