mirror of https://github.com/JPyke3/mbp-manjaro
[nxd] fix merge conflict
This commit is contained in:
parent
955a407302
commit
134267e680
|
@ -92,12 +92,7 @@ terminus-font
|
||||||
|
|
||||||
## Package management
|
## Package management
|
||||||
#appimagelauncher
|
#appimagelauncher
|
||||||
<<<<<<< HEAD
|
|
||||||
pamac
|
|
||||||
=======
|
|
||||||
bauh
|
|
||||||
pamac-gtk
|
pamac-gtk
|
||||||
>>>>>>> ce5f3cd... [prepare] 20.0.2
|
|
||||||
pamac-tray-appindicator
|
pamac-tray-appindicator
|
||||||
pamac-cli
|
pamac-cli
|
||||||
>extra apparmor
|
>extra apparmor
|
||||||
|
|
Loading…
Reference in New Issue