summaryrefslogtreecommitdiffstats
path: root/xorg-data/xkeyboard-config/CONFLICTS
diff options
context:
space:
mode:
authorEric Sandall2010-04-06 19:37:10 -0700
committerEric Sandall2010-04-06 19:37:10 -0700
commitc201de6aed0e1080683b79eae95813f545aa653e (patch)
tree18d314e5e1e626ae4b340aa6412563781c58211b /xorg-data/xkeyboard-config/CONFLICTS
parentee6fc3668dea469818fe1dc572375f9660ed6c8e (diff)
xkeyboard-config: Didn't mean to remove the conflict against xkbdata
Diffstat (limited to 'xorg-data/xkeyboard-config/CONFLICTS')
-rwxr-xr-xxorg-data/xkeyboard-config/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-data/xkeyboard-config/CONFLICTS b/xorg-data/xkeyboard-config/CONFLICTS
new file mode 100755
index 0000000000..61c053f12c
--- /dev/null
+++ b/xorg-data/xkeyboard-config/CONFLICTS
@@ -0,0 +1 @@
+conflicts xkbdata