From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 8 Sep 2009 19:55:07 +0000 (-0400)
Subject: fix broken merge
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=c8562c943ee4d956df93dea76a71e7ff2160fb4b;p=sup

fix broken merge

Whoops!
---

diff --git a/bin/sup b/bin/sup
index b3a4f45..e72dba5 100755
--- 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