]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commit
module-init-tools: Remove conflicting file.
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 11 Nov 2011 21:02:16 +0000 (22:02 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 11 Nov 2011 21:02:16 +0000 (22:02 +0100)
commitdc5ecc1c8ca4c530d8149e06e814f0208efb9139
tree280b0cc5a1ee8caf0d3ce8e4f23f1a2c5a141b9f
parentb8b2278745bb2fe0a49aa9f8b3ff38d4592e4bfc
module-init-tools: Remove conflicting file.

The /etc/modproble.d/blacklist.conf conflicted with the shipped of hwdata.
module-init-tools/modprobe.d/blacklist.conf [deleted file]
module-init-tools/module-init-tools.nm