forked from mirrored-repos/iso-profiles
resolve conflict
This commit is contained in:
commit
88156462fb
1 changed files with 2 additions and 3 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue