From 029ff9d5c00e020d0c6b57911bf53e571d6e5bcd Mon Sep 17 00:00:00 2001
From: tkarrass <tkarrass@bitsetter.de>
Date: Sat, 2 Nov 2013 19:58:59 +0100
Subject: [PATCH] local state

---
 src/display.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/display.c b/src/display.c
index b2430b9..01ffa60 100644
--- a/src/display.c
+++ b/src/display.c
@@ -5,7 +5,6 @@
 
 #include "display.h"
 
-<<<<<<< HEAD
 
 void setup_display() {
 	initscr();   // ncurses initialization
@@ -23,11 +22,11 @@ void cleanup_display() {
 	uint32_t height;	// normally 25, may vary
 	char *image;		// dimension is width x height
 */
-void print_current_image(message* msg, int start, int end) {
+void print_current_image(struct message* msg, int start, int end) {
 	// end is ignored and 80 is used, should be considered later
 
 	move(0,0); // start in the upper left corner
-	char *pic = msg->img; // get a ptr to the actual image
+	char *pic = msg->image; // get a ptr to the actual image
 	
 	for (int row=0; row < 25; row++) { // iterate rows
 		char *line = (char*) malloc(81);