resolve conflict

This commit is contained in:
Bernhard Landauer 2020-01-17 17:11:03 +01:00
commit 88156462fb
1 changed files with 2 additions and 3 deletions

View File

@ -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