Merge conflict

This commit is contained in:
Andrew Scott 2022-06-09 11:39:48 -04:00
commit 12a954114b
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
2 changed files with 1 additions and 0 deletions

View file

@ -463,3 +463,4 @@
(use-package yasnippet-snippets) (use-package yasnippet-snippets)
;;; End init.el ;;; End init.el

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 240 KiB