Lila-Kuh/alma_philmmanjaro
1
0
Fork 0
mirror of https://github.com/philmmanjaro/alma.git synced 2025-12-06 19:29:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

[presets] fix some files

Browse Source
This commit is contained in:
Philip Mueller
2023-06-22 22:38:45 +02:00
parent 19d26cf0bf
commit 0bd7be2304
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
presets/xfce.toml
View File

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

4
presets/xorg.toml
View File

@@ -1,5 +1 @@
<<<<<<< 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", "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)