[presets] fix user toml

This commit is contained in:
Philip Müller 2020-07-03 18:27:56 +02:00 committed by Philip Mueller
parent 20a80c73e2
commit 19d26cf0bf
7 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1 @@
../base.toml

View File

@ -0,0 +1 @@
../xorg.toml

View File

@ -0,0 +1 @@
../user.toml

View File

@ -0,0 +1 @@
../kde.toml

View File

@ -0,0 +1 @@
../steam.toml

View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter-settings", "accountsservice"]
=======
packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter"]
>>>>>>> 4cab099 ([presets] fix user toml)
script = """
set -exu

View File

@ -1 +1,5 @@
<<<<<<< HEAD
packages = ["xf86-input-libinput", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-nouveau", "xorg-server", "xterm"]
=======
packages = ["xf86-input-libinput", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-nouveau", "xf86-video-vesa", "xorg-server", "xterm"]
>>>>>>> 4cab099 ([presets] fix user toml)