Skip to content

Commit f3b09d9

Browse files
committed
fix confict
2 parents 8b3f5f5 + b0836ec commit f3b09d9

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

Diff for: init.el

-13
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,3 @@
77
(add-subdirs-to-load-path "~/.emacs.d/config/")
88

99
(require 'init)
10-
(custom-set-variables
11-
;; custom-set-variables was added by Custom.
12-
;; If you edit it by hand, you could mess it up, so be careful.
13-
;; Your init file should contain only one such instance.
14-
;; If there is more than one, they won't work right.
15-
'(package-selected-packages
16-
'(protobuf-mode meow tree-sitter-indent tree-sitter-langs tree-sitter auto-composition auto-composition-mode composite dashboard helm-projectile magit mc-extras yasnippet go-projectile csharp-mode ccls lsp-pyright py-autopep8 lsp-ui window-numbering which-key use-package rainbow-mode rainbow-delimiters quelpa olivetti mmm-mode markdown-mode lv hungry-delete helm-gtags flycheck exec-path-from-shell doom-themes doom-modeline conda company)))
17-
(custom-set-faces
18-
;; custom-set-faces was added by Custom.
19-
;; If you edit it by hand, you could mess it up, so be careful.
20-
;; Your init file should contain only one such instance.
21-
;; If there is more than one, they won't work right.
22-
)

0 commit comments

Comments
 (0)