From: Martin Mares <mj@ucw.cz>
Date: Mon, 11 Feb 2008 21:07:48 +0000 (+0100)
Subject: Removed a forgotten merge conflict marker.
X-Git-Tag: v3.0.0~1^2~51
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=aa1a5b4d0186b85b86fc4733698fd799a05b2c50;p=pciutils.git

Removed a forgotten merge conflict marker.
---

diff --git a/ChangeLog b/ChangeLog
index 59b777c..442d805 100644
--- 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.