diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-22 14:42:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-22 14:42:03 -0400 |
| commit | 1ba03e425ca48aa9d9c32861681c9e5b70abe881 (patch) | |
| tree | 2f162520589c649978a9986e8cce9e2e39c0e96c /config.hs | |
| parent | 85a6ca99ac40d521b3634af6f4f8c9f8b227a0ff (diff) | |
| parent | eebdd018cd4c3054c258eeb7a6b304b263d62a74 (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 |