summaryrefslogtreecommitdiffstats
path: root/config/known-conflicts.lst
diff options
context:
space:
mode:
Diffstat (limited to 'config/known-conflicts.lst')
-rw-r--r--config/known-conflicts.lst5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/known-conflicts.lst b/config/known-conflicts.lst
index afedcef..fabe510 100644
--- a/config/known-conflicts.lst
+++ b/config/known-conflicts.lst
@@ -3,3 +3,8 @@ broadcom-bcma-config
broadcom-ssb-config
grub2-efi # shouldn't be needed in mga7
guile1.8
+pavucontrol-qt
+postfix
+
+i586: libossp_uuid-devel
+x86_64: lib64ossp_uuid-devel