This makes it easier to resolve merge conflicts in Org files.
Description
My .emacs.d directory
Languages
Emacs Lisp
97.8%
YASnippet
2.2%