From fc08c34b9d9e5ed376adf28a535d06413914e647 Mon Sep 17 00:00:00 2001
From: Soliprem <franci.solidoro@gmail.com>
Date: Mon, 30 Sep 2024 14:36:40 +0200
Subject: [PATCH] removing artifacts from merge

---
 modules/plugins/lsp/otter/otter.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/plugins/lsp/otter/otter.nix b/modules/plugins/lsp/otter/otter.nix
index d46c6d54..79797aaf 100644
--- a/modules/plugins/lsp/otter/otter.nix
+++ b/modules/plugins/lsp/otter/otter.nix
@@ -1,5 +1,4 @@
 {lib, ...}: let
-<<<<<<< HEAD
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.types) bool str listOf;
@@ -59,16 +58,6 @@ in {
             (eg. in Org files) When true, otter handles these cases fully.
           '';
         };
-=======
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.binds) mkMappingOption;
-in {
-  options.vim.lsp = {
-    otter = {
-      enable = mkEnableOption "Otter LSP Injector";
-      mappings = {
-        toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "<leader>lo";
->>>>>>> 7b46366e53493c2843f9524e2e80916ea9cea99b
       };
     };
   };