diff --git a/.gitignore b/.gitignore index 15f8b60..82fa64e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,17 +10,10 @@ projects recentf transient tree-sitter -<<<<<<< HEAD -**/*.el -======= **/*.el !.dir-locals.el eshell request -<<<<<<< HEAD ->>>>>>> be5987a (added dir locals to allow emacs submodule as a project) -======= /.cache/ /mastodon.plstore /persist/ ->>>>>>> c7ec4a3 (Added new packages/emojis)