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

resolve conflict

This commit is contained in:
Bernhard Landauer 2020-01-17 17:11:03 +01:00
parent 168d454738 04a5fafea6
commit 88156462fb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manjaro/kde/Packages-Desktop
View File

@ -251,12 +251,11 @@ poppler-data # encoding data to display PDF documents containing CJK characters
## Applications ## Applications
>extra cantata >extra cantata
dmidecode # for inxi -m output dmidecode # for inxi -m output
firefox
htop htop
imagewriter imagewriter
inxi inxi
>extra krita #>extra krita
>extra firefox
>basic falkon
ms-office-online ms-office-online
#>extra freeoffice #>extra freeoffice
#>extra libreoffice-still #>extra libreoffice-still