merge master

manateelazycat · Nov 1, 2023 · bfd0020 · bfd0020
1 parent 0eb5e75
commit bfd0020
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/lsp-bridge.el b/lsp-bridge.el
@@ -2449,13 +2449,7 @@ We need exclude `markdown-code-fontification:*' buffer in `lsp-bridge-monitor-be
     (add-hook 'kill-buffer-hook 'lsp-bridge-remote-kill-buffer nil t)
     (setq lsp-bridge-tramp-sync-var t)))
 
-<<<<<<< Updated upstream
-(defcustom lsp-bridge-tramp-blacklist nil "tramp-hosts that disable lsp-bridge")
-||||||| Stash base
-(defvar lsp-bridge-tramp-blacklist nil)
-=======
 (defcustom lsp-bridge-tramp-blacklist nil "tramp hosts that don't use lsp-bridge")
->>>>>>> Stashed changes
 
 (defun lsp-bridge-sync-tramp-remote ()
   (interactive)