diff options
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/serial/serial.h | 3 |
1 files changed, 0 insertions, 3 deletions
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; |