From 8cb583cf8031f4e7db77e1b88ea164e7ff5994c9 Mon Sep 17 00:00:00 2001 From: px4dev Date: Wed, 6 Feb 2013 23:50:55 -0800 Subject: Assorted compile fixes. --- nuttx/include/nuttx/serial/serial.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'nuttx/include') diff --git a/nuttx/include/nuttx/serial/serial.h b/nuttx/include/nuttx/serial/serial.h index d72038e17..4ee2005ef 100644 --- a/nuttx/include/nuttx/serial/serial.h +++ b/nuttx/include/nuttx/serial/serial.h @@ -220,7 +220,6 @@ struct uart_dev_s #ifndef CONFIG_DISABLE_POLL struct pollfd *fds[CONFIG_SERIAL_NPOLLWAITERS]; #endif -<<<<<<< HEAD /* Terminal control flags */ @@ -230,8 +229,6 @@ struct uart_dev_s tcflag_t tc_lflag; /* Local modes */ #endif -======= ->>>>>>> 049c93446561c6ad3e59183c139f3916230ddee5 }; typedef struct uart_dev_s uart_dev_t; -- cgit v1.2.3