diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-11 16:02:12 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-11 16:02:12 -0800 |
| commit | 4d1e00c49610b69b2446562880bef4f82b18d546 (patch) | |
| tree | 21f14421bc4e728fc4ddb88d56de41aa40e4bf42 /src/mm-serial-port.h | |
| parent | 3ec7e89f112cb65a584de84b76e207d7a804bd6f (diff) | |
core: fix merge damage
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. |