From 0bd7be23047ec80540be023b1e7e64b8e9ac830e Mon Sep 17 00:00:00 2001 From: Philip Mueller Date: Thu, 22 Jun 2023 22:38:45 +0200 Subject: [PATCH] [presets] fix some files --- presets/xfce.toml | 4 ---- presets/xorg.toml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/presets/xfce.toml b/presets/xfce.toml index c6fda38..ba729d0 100644 --- a/presets/xfce.toml +++ b/presets/xfce.toml @@ -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 diff --git a/presets/xorg.toml b/presets/xorg.toml index f2d095d..0106147 100644 --- a/presets/xorg.toml +++ b/presets/xorg.toml @@ -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)