wwww reverted back to before breaking

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index c1fe7c29a1e0653d2e7ca4875c16d06c7250a397..abd71bdf1b8f888737bd5fe563a990d432322148 100755 (executable)
--- 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\r
 typedef struct {\r
        bitmap_t far *data;             //old\r
-<<<<<<< HEAD
-       //planar_buf_t far *data;       //old\r
-=======
        //planar_buf_t far *pbdata;     //old\r
->>>>>>> ee3674e42a19f516ea9a48df2c9f3593409141c6
        word tileHeight, tileWidth;\r
        unsigned int rows, cols;\r
 //     #ifdef __DEBUG__\r