Resolve conflict in emacs.d

Browse Source

...

This commit is contained in:

Ivan Malison

2014-11-09 22:22:22 -08:00

parent b775752068

commit 3fc39b029c

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dotfiles/emacs.d

Submodule dotfiles/emacs.d updated: fe9a06eebc...1ddbea2c1a