]> mj.ucw.cz Git - pciutils.git/commit
Removed a forgotten merge conflict marker.
authorMartin Mares <mj@ucw.cz>
Mon, 11 Feb 2008 21:07:48 +0000 (22:07 +0100)
committerMartin Mares <mj@ucw.cz>
Mon, 11 Feb 2008 21:07:48 +0000 (22:07 +0100)
commitaa1a5b4d0186b85b86fc4733698fd799a05b2c50
tree5d5f9c3510dc6a4e562e9f28d043fea9f4203f3c
parent7059c71191b16b439bc6c01803a3c670649da202
Removed a forgotten merge conflict marker.
ChangeLog