resolve conflict

This commit is contained in:
Bernhard Landauer 2019-12-15 01:11:25 +01:00
parent 7d603d9b44
commit 956894406a
4 changed files with 1 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -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