forked from mirrored-repos/iso-profiles
resolve conflict
This commit is contained in:
parent
7d603d9b44
commit
956894406a
4 changed files with 1 additions and 4 deletions
|
@ -112,7 +112,6 @@ mattercontrol
|
||||||
#avrdude
|
#avrdude
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
|
@ -114,7 +114,6 @@ octopi-notifier-frameworks
|
||||||
>extra splix
|
>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -102,7 +102,6 @@ flatpak
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
Loading…
Reference in a new issue