From f4d25deba1f00b2360ed2b4d3c605aff117fa40f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcelo=20Munhoz=20P=C3=A9los?= <mpelos@gmail.com>
Date: Thu, 11 Jul 2013 23:40:40 -0300
Subject: [PATCH] Implements file move option in ROM list.

---
 apple/iOS/browser.m | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apple/iOS/browser.m b/apple/iOS/browser.m
index dcdf2b90b9..278ae756b2 100644
--- a/apple/iOS/browser.m
+++ b/apple/iOS/browser.m
@@ -216,11 +216,7 @@
         if (didCreateFolder) {
             [self refresh];
         } else {
-<<<<<<< HEAD
             apple_display_alert(@"It was not possible to create folder.", 0);
-=======
-            apple_display_alert(@"Not possible to create folder.", 0);
->>>>>>> Adds new Folder option in ROM list.
         }
     }
 }