Merge conflict

mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-12-23 02:13:11 -05:00
2024-12-23 02:13:11 -05:00 · 2022-06-09 11:39:48 -04:00 · 2022-06-09 11:39:48 -04:00 · 12a954114b
commit 12a954114b
parent b770bf66a6 38b4a6bd2c
2 changed files with 1 additions and 0 deletions
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@ -463,3 +463,4 @@
 (use-package yasnippet-snippets)
 ;;; End init.el
--- a/info/screenshots/screenshot2.png
+++ b/info/screenshots/screenshot2.png
`@ -463,3 +463,4 @@`

	`(use-package yasnippet-snippets)`	`(use-package yasnippet-snippets)`
	`;;; End init.el`	`;;; End init.el`