Pedantic indentation of ChangeLog and remove merge leftover
diff --git a/ChangeLog b/ChangeLog
index 711ba33..9878ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,11 @@
-<<<<<<< ChangeLog
2007-10-16 Jeff Mitchell <kde-dev@emailgoeshere.com>
- * src/libusb-glue.c: remove the previously-concatenated vendor
- and product string "name" field as it's now redundant
- * src/Makefile.am: interface to libmtp.so.7.0.0 (incompatible,
- device_entry_struct members changed)
- * examples/hotplug.c: port to use vendor and product instead of
- name, also some useful commenting in the fdi file
+ * src/libusb-glue.c: remove the previously-concatenated vendor
+ and product string "name" field as it's now redundant
+ * src/Makefile.am: interface to libmtp.so.7.0.0 (incompatible,
+ device_entry_struct members changed)
+ * examples/hotplug.c: port to use vendor and product instead of
+ name, also some useful commenting in the fdi file
2007-10-15 Linus Walleij <triad@df.lth.se>
@@ -18,8 +17,8 @@
2007-10-09 Jeff Mitchell <kde-dev@emailgoeshere.com>
- * src/libusb-glue.c: add separate vendor and product strings
- in device entry structs
+ * src/libusb-glue.c: add separate vendor and product strings
+ in device entry structs
* src/libmtp.h.in: update device entry structs to reflect this
2007-10-04 Linus Walleij <triad@df.lth.se>