diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
| commit | 4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (patch) | |
| tree | b275d7a21d46c421d9487dcd1d5043ba8a9bfe5d /.config/meld/meldrc.ini | |
| parent | 3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff) | |
| parent | 3c7c6090cd2e385651f6ef79391c42a65ac06344 (diff) | |
Merge branch 'hp-dv6426us-par'
Conflicts:
.crontab.local
.git.info.exclude
.wmii/wmiirc_local
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 |