fix

koush · koush · commit ef83d3ea8748 · 2010-07-19T08:54:23.000-07:00
Change-Id: I9bc8cfde27b89d9a548c47c5727530c604d36ee0
diff --git 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:
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,7 @@ prompt_and_wait() {`
`493`	`493`	`return; // reboot if logs aren't visible`
`494`	`494`	`} else {`
`495`	`495`	`ui_print("\nInstall from sdcard complete.\n");`
	`496`	`+ }`
`496`	`497`	`}`
`497`	`498`	`break;`
`498`	`499`	`case ITEM_INSTALL_ZIP:`
Original file line number	Diff line number	Diff line change
`@@ -599,8 +599,4 @@ void ui_set_showing_back_button(int showBackButton) {`
`599`	`599`
`600`	`600`	`int ui_get_showing_back_button() {`
`601`	`601`	`return gShowBackButton;`
`602`		`-<<<<<<< HEAD`
`603`	`602`	`}`
`604`		`-=======`
`605`		`-}`
`606`		`->>>>>>> github/eclair`