mirror of
https://github.com/larstvei/dot-emacs.git
synced 2025-02-21 16:10:11 +00:00
Fix merge conflict
This commit is contained in:
parent
42d9a7763f
commit
aa803a9bc6