resolve conflict

2019-12-15 01:11:25 +01:00 · 2019-12-15 01:11:25 +01:00 · 956894406a
commit 956894406a
parent 7d603d9b44
4 changed files with 1 additions and 4 deletions
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@ -147,4 +147,4 @@ zathura-djvu
 >extra pulseaudio-bluetooth
 >extra manjaro-printer
 >extra manjaro-settings-manager-notifier
->extra manjaro-wallpapers-18.0
+>extra manjaro-wallpapers-18.0
--- a/community/webdad/Packages-Desktop
+++ b/community/webdad/Packages-Desktop
@ -112,7 +112,6 @@ mattercontrol
 #avrdude

 ## Optional dependencies for hplip
->extra pyqt5-common # For hplip
 >extra python-pillow # For hplip
 >extra python-pip # For hplip
 >extra python-pyqt5  # For hplip gui
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@ -114,7 +114,6 @@ octopi-notifier-frameworks
 >extra splix

 ## Optional dependencies for hplip
->extra pyqt5-common
 >extra python-pillow
 >extra python-pip
 >extra python-pyqt5
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@ -102,7 +102,6 @@ flatpak
 >extra system-config-printer

 ## Optional dependencies for hplip
->extra pyqt5-common # For hplip
 >extra python-pillow # For hplip
 >extra python-pip # For hplip
 >extra python-pyqt5  # For hplip gui