summaryrefslogtreecommitdiffstats
path: root/disk/gummiboot/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'disk/gummiboot/CONFLICTS')
-rwxr-xr-xdisk/gummiboot/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/disk/gummiboot/CONFLICTS b/disk/gummiboot/CONFLICTS
new file mode 100755
index 0000000000..ddeb5353ae
--- /dev/null
+++ b/disk/gummiboot/CONFLICTS
@@ -0,0 +1 @@
+conflicts gummiboot y