fix

Change-Id: I9bc8cfde27b89d9a548c47c5727530c604d36ee0
2010-07-19 08:54:23 -07:00 · 2010-07-19 08:54:23 -07:00 · ef83d3ea87
commit ef83d3ea87
parent 702294d5b8
2 changed files with 1 additions and 4 deletions
--- a/recovery.c
+++ b/recovery.c
@ -493,6 +493,7 @@ prompt_and_wait() {
                        return;  // reboot if logs aren't visible
                    } else {
                        ui_print("\nInstall from sdcard complete.\n");
+                    }
                }
                break;
            case ITEM_INSTALL_ZIP:
--- a/ui.c
+++ b/ui.c
@ -599,8 +599,4 @@ void ui_set_showing_back_button(int showBackButton) {

 int ui_get_showing_back_button() {
    return gShowBackButton;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> github/eclair