merge conflict

This commit is contained in:
Sam Precious
2021-02-21 20:36:28 +00:00
76 changed files with 477 additions and 211 deletions

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\\'")