Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

[pciutils.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 20df7a62cd4287fca2c26f01b9519b2a3298a5ae..35cb5db97d251d4f895adcc6c7ed7f8d537f1887 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -148,6 +148,7 @@
        * 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.