fix broken merge

Whoops!

diff --git a/bin/sup b/bin/sup
index b3a4f458772334a82832587a953394a4041d8ba5..e72dba5fefaaace93a3706f2904168168bb7dd9a 100755 (executable)
--- a/bin/sup
+++ b/bin/sup
@@ -296,14 +296,11 @@ begin
         b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
         b.mode.load_threads :num => b.content_height if new
       end
-<<<<<<< HEAD:bin/sup
     when :show_inbox
       BufferManager.raise_to_front ibuf
-=======
     when :show_console
       b, new = bm.spawn_unless_exists("Console", :system => true) { ConsoleMode.new }
       b.mode.run
->>>>>>> console-mode:bin/sup
     when :nothing, InputSequenceAborted
     when :redraw
       bm.completely_redraw_screen