diff options
Diffstat (limited to 'src/mm-serial-port.h')
| -rw-r--r-- | src/mm-serial-port.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h index 6835d8bf..a8ee8bee 100644 --- a/src/mm-serial-port.h +++ b/src/mm-serial-port.h @@ -50,7 +50,6 @@ struct _MMSerialPort { struct _MMSerialPortClass { MMPortClass parent; -<<<<<<< HEAD /* Called for subclasses to parse unsolicited responses. If any recognized * unsolicited response is found, it should be removed from the 'response' * byte array before returning. |