From aac78fe62e70e6a8aabae47df068c47d8c1d051e Mon Sep 17 00:00:00 2001
From: "Derek S. Ray" <derekray@gmail.com>
Date: Mon, 6 Apr 2015 17:17:30 -0400
Subject: [PATCH] Fix up errors from mass manual conflict resolution

---
 win/tty/wintty.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 0aaf9e92d..af42dc457 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -2204,6 +2204,10 @@ tty_putstr(window, attr, str)
 		cw->data[cw->cury-1][++i] = '\0';
 		tty_putstr(window, attr, &str[i]);
 	    }
+	}
+	break;
+    }
+}
 
 	}
 	break;
-- 
2.49.0