mirrors/mbp-manjaro
mirrors
/
mbp-manjaro
mirror of https://github.com/JPyke3/mbp-manjaro
1
0
Fork 0
Code Issues Releases Wiki Activity

[nxd] fix merge conflict

This commit is contained in:
Philip Müller 2020-05-30 11:49:37 +02:00
parent 955a407302
commit 134267e680
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manjaro/nxd/Packages-Desktop
View File

@ -92,12 +92,7 @@ terminus-font
## Package management
#appimagelauncher
<<<<<<< HEAD
pamac
=======
bauh
pamac-gtk
>>>>>>> ce5f3cd... [prepare] 20.0.2
pamac-tray-appindicator
pamac-cli
>extra apparmor