summaryrefslogtreecommitdiffstats
path: root/disk/vcdimager/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'disk/vcdimager/CONFLICTS')
-rwxr-xr-xdisk/vcdimager/CONFLICTS2
1 files changed, 1 insertions, 1 deletions
diff --git a/disk/vcdimager/CONFLICTS b/disk/vcdimager/CONFLICTS
index 105be584e1..fc78566f2f 100755
--- a/disk/vcdimager/CONFLICTS
+++ b/disk/vcdimager/CONFLICTS
@@ -1 +1 @@
-conflicts vcdimager-unstable
+conflicts vcdimager-unstable y