From 9d460cb19e0c98520fc9c063f5e7a31ad97c9add Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Feb 2017 13:55:19 -0600
Subject: [PATCH] wwww reverted back to before breaking

---
 src/lib/16_tdef.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index c1fe7c29..abd71bdf 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -67,11 +67,7 @@ typedef struct {
 //TODO: 16_mm and 16_ca must handle this
 typedef struct {
 	bitmap_t far *data;		//old
-<<<<<<< HEAD
-	//planar_buf_t far *data;	//old
-=======
 	//planar_buf_t far *pbdata;	//old
->>>>>>> ee3674e42a19f516ea9a48df2c9f3593409141c6
 	word tileHeight, tileWidth;
 	unsigned int rows, cols;
 // 	#ifdef __DEBUG__
-- 
2.39.5