Removed a forgotten merge conflict marker.

diff --git a/ChangeLog b/ChangeLog
index 59b777cb8158af6b9eab47f14b510944a830e0c3..442d80586426e00a67a8e4922c7b894a0b39d737 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,7 +150,6 @@
        * lspci.c (show_express): Added PCI/PCI-X to PCI-Express Bridge type.
        Patch by Mark Glines.
 
->>>>>>> main
 2007-02-09  Martin Mares  <mj@ucw.cz>
 
        * pci.ids: Updated to the current snapshot of the database.