removed commit

2025-02-27 10:34:32 -07:00 · 2025-02-27 10:34:32 -07:00 · ce1361397d
commit ce1361397d
parent bcd509f331
3 changed files with 12 additions and 1 deletions
--- a/.cache/treemacs-persist
+++ b/.cache/treemacs-persist
@ -0,0 +1,3 @@
+* Default
+** cnelson
+ - path :: ~
--- a/.dir-locals.el
+++ b/.dir-locals.el
@ -0,0 +1 @@
+((nil . ((project-vc-merge-submodules . nil))))
--- a/.gitignore
+++ b/.gitignore
@ -9,4 +9,11 @@ projects
 recentf
 transient
 tree-sitter
-**/*.el
+<<<<<<< HEAD
+**/*.el
+=======
+**/*.el
+!.dir-locals.el
+eshell
+request
+>>>>>>> be5987a (added dir locals to allow emacs submodule as a project)
				`@ -0,0 +1 @@`
				`((nil . ((project-vc-merge-submodules . nil))))`