Fixed

2012-10-21 15:50:19 -07:00 · 2012-10-21 15:50:19 -07:00 · 4128a8ec1b
parent 6e20c68e33
commit 4128a8ec1b
1 changed files with 0 additions and 4 deletions
--- a/toorchat.py
+++ b/toorchat.py
@ -104,11 +104,7 @@ class Visualizer():
 				entry = self.screen.getch()
 				if entry == curses.KEY_RESIZE:
 					self.__draw_frame__(False)
-<<<<<<< Updated upstream
 				if entry == 10:
-=======
-				if entry == ord('\n'):
->>>>>>> Stashed changes
 					self.screen.nodelay(0)
 					user_input = self.screen.getstr(1, 1, 60)
 					old_message = self.protocol.send_chat_message(user_input, self.user)