From 81ee8d587ed713ebef29c1e450f5bc2557119c07 Mon Sep 17 00:00:00 2001
From: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 17 Aug 2009 13:32:57 -0700
Subject: [PATCH] clean up some minor conflict mis-resolutions

---
 bin/sup           | 2 +-
 lib/sup/buffer.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/sup b/bin/sup
index 5d651be..317857d 100755
--- a/bin/sup
+++ b/bin/sup
@@ -213,7 +213,7 @@ begin
 
     if c.nil?
       if BufferManager.sigwinch_happened?
-        Redwood::log "redrawing screen on sigwinch"
+        debug "redrawing screen on sigwinch"
         BufferManager.completely_redraw_screen
       end
       next
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index e1d1bc6..be2d1bb 100644
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -271,7 +271,7 @@ EOS
     Ncurses.stdscr.keypad 1
     Ncurses.refresh
     @sigwinch_mutex.synchronize { @sigwinch_happened = false }
-    Redwood::log "new screen size is #{Ncurses.rows} x #{Ncurses.cols}"
+    debug "new screen size is #{Ncurses.rows} x #{Ncurses.cols}"
 
     status, title = get_status_and_title(@focus_buf) # must be called outside of the ncurses lock
 
-- 
2.45.2