branch: externals/company commit 1b985d18667c5b58bce600a83de8d65e82aee390 Author: Dmitry Gutov <dgu...@yandex.ru> Commit: Dmitry Gutov <dgu...@yandex.ru>
Set project-vc-merge-submodules to nil [ci skip] --- .dir-locals.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index 79d9a12..8e92085 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,4 +1,5 @@ ((nil . ((indent-tabs-mode . nil) (fill-column . 80) (sentence-end-double-space . t) - (emacs-lisp-docstring-fill-column . 75)))) + (emacs-lisp-docstring-fill-column . 75) + (project-vc-merge-submodules . nil))))