diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
commit | dbab2a06f142894f446f1f66b637242862dcd7bf (patch) | |
tree | c8888e76f39647edad67abd73e74605b1d95b3aa /.config/meld/meldrc.ini | |
parent | bd8512e48b8ca0f44171c06578da7a5f3cd6663f (diff) | |
parent | 344bd61ba0d7d06b3cec6499ef6b4058f9d64626 (diff) |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
.emacs.d/custom.el
Diffstat (limited to '.config/meld/meldrc.ini')
l--------- | .config/meld/meldrc.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/meld/meldrc.ini b/.config/meld/meldrc.ini new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/.config/meld/meldrc.ini @@ -0,0 +1 @@ +/dev/null
\ No newline at end of file |