From 89ddced317d10a923f02b3f59c0c55cd0f3fbc38 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 06 Sep 2015 11:58:44 -0400
Subject: pciids-*: Drop Conflicts

---
(limited to '.gitignore')

--
cgit v0.9.1