diff options
| author | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
|---|---|---|
| committer | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
| commit | bd18a38c2898548a3664a9ddab9f79c84f2caf4a (patch) | |
| tree | 95b9933376770381bd8859782ae763be81c2d72b /.gitignore | |
| parent | b07628dddf418d4f47b858e6c35fd3520fbaeed2 (diff) | |
| parent | ef160dea332af4b4fe5e2717b962936c67e5fe9e (diff) | |
Merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,2 +1,2 @@ -*.~ -*~
\ No newline at end of file +elpa +projectile-bookmarks.eld
\ No newline at end of file |