1 files changed, 1 insertions, 4 deletions
diff --git a/atari/gui.c b/atari/gui.c
index 19ae6505e..fdcd0d4bb 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -77,7 +77,7 @@
 #include "cflib.h"
 
 #define TODO() (0)/*printf("%s Unimplemented!\n", __FUNCTION__)*/
-
+
 struct gui_window *input_window = NULL;
 struct gui_window *window_list = NULL;
 void * h_gem_rsrc;
@@ -986,6 +986,3 @@ int main(int argc, char** argv)
 
 	return 0;
 }
-
-
->>>>>>> master