From aaf286dce4a9025cc01b80de0c6bcffe1a074109 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 27 Apr 2024 16:13:19 +0300
Subject: [PATCH] modules: fix merge conflicts

---
 modules/plugins/languages/css.nix       | 4 ++--
 modules/utility/telescope/telescope.nix | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index 3fcf5cf..748b82d 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -96,13 +96,13 @@ in {
 
       type = mkOption {
         description = "CSS formatter to use";
-        type = with types; enum (attrNames formats);
+        type = enum (attrNames formats);
         default = defaultFormat;
       };
 
       package = mkOption {
         description = "CSS formatter package";
-        type = types.package;
+        type = package;
         default = formats.${cfg.format.type}.package;
       };
     };
diff --git a/modules/utility/telescope/telescope.nix b/modules/utility/telescope/telescope.nix
index 13d67cb..9cfd092 100644
--- a/modules/utility/telescope/telescope.nix
+++ b/modules/utility/telescope/telescope.nix
@@ -51,4 +51,3 @@ in {
     };
   };
 }
-