Browse Source

Fixed merge issue

master
Josh Wolfe 2 years ago
parent
commit
ae0665f48b
1 changed files with 0 additions and 4 deletions
  1. 0
    4
      emacs/.emacs.d/README.org

+ 0
- 4
emacs/.emacs.d/README.org View File

@@ -1382,7 +1382,6 @@ Project management
(use-package omnisharp
:after company
:config
<<<<<<< Updated upstream
(when wolfe/windows?
(setq omnisharp-server-executable-path "C:/emacs/omnisharp/Omnisharp.exe"))
(add-hook 'csharp-mode-hook
@@ -1390,9 +1389,6 @@ Project management
(evil-define-key 'normal omnisharp-mode-map (kbd "g d") 'omnisharp-go-to-definition)
(unless (file-exists-p "Makefile")
(set (make-local-variable 'compile-command) (concat "msbuild " (cdr (assoc :project-root omnisharp--server-info)))))))

=======
>>>>>>> Stashed changes
(add-hook 'csharp-mode-hook 'omnisharp-mode)
(add-to-list 'company-backends 'company-omnisharp))
#+END_SRC

Loading…
Cancel
Save