diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-29 11:45:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-29 11:45:06 -0400 |
| commit | 578ebbf861a074c33050f4fb927f6f88d442947d (patch) | |
| tree | d3d3787e4c8ee4c1b4f9413174497a09eee8b525 /config.hs | |
| parent | 3fc6850ee79ecf3e084cf99b19cf695b90a0129b (diff) | |
| parent | fbcfa185eb4cb79380a0db0c1772082d5619ba1d (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'config.hs')
| l--------- | config.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -joeyconfig.hs
\ No newline at end of file +config-simple.hs
\ No newline at end of file |