mirror of https://github.com/JPyke3/mbp-manjaro
resolve conflict
This commit is contained in:
commit
88156462fb
|
@ -251,12 +251,11 @@ poppler-data # encoding data to display PDF documents containing CJK characters
|
|||
## Applications
|
||||
>extra cantata
|
||||
dmidecode # for inxi -m output
|
||||
firefox
|
||||
htop
|
||||
imagewriter
|
||||
inxi
|
||||
>extra krita
|
||||
>extra firefox
|
||||
>basic falkon
|
||||
#>extra krita
|
||||
ms-office-online
|
||||
#>extra freeoffice
|
||||
#>extra libreoffice-still
|
||||
|
|
Loading…
Reference in New Issue