emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge conflict

Browse source
This commit is contained in:
Sam Precious 2021-02-21 20:36:28 +00:00
commit 645fde6b42
76 changed files with 477 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/lang/csharp/config.el
View file

@ -98,3 +98,5 @@ or terminating simple string."
:when (featurep! +dotnet)
:bind
("C-c d" . sharper-main-transient))
(use-package! sln-mode :mode "\\.sln\\'")

1
modules/lang/csharp/packages.el
View file

@ -3,6 +3,7 @@
(package! csharp-mode :pin "49168293a28aaaf84b9655fe1b2abe402c5e2ee1")
(package! csproj-mode :pin "a7f0f4610c976a28c41b9b8299892f88b5d0336c")
(package! sln-mode :pin "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c")
(unless (featurep! +lsp)
(package! omnisharp :pin "e26ff8b8d34a247cd4a93be5d62a5f21859b7b57"))
(when (featurep! +unity)