mirror of
https://github.com/philmmanjaro/alma.git
synced 2025-12-06 19:39:20 +01:00
[presets] fix some files
This commit is contained in:
@@ -1,8 +1,4 @@
|
||||
<<<<<<< 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
|
||||
|
||||
|
||||
@@ -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", "xf86-video-vesa", "xorg-server", "xterm"]
|
||||
>>>>>>> 4cab099 ([presets] fix user toml)
|
||||
|
||||
Reference in New Issue
Block a user