colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/emacs.d

@ -1 +1 @@
Subproject commit fe9a06eebcc31f846251c4a11b04526ff0bd7e01
Subproject commit 1ddbea2c1a1da55708822af67fbf3ce1379134e7