diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-29 14:01:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-29 14:01:18 -0400 |
| commit | 45509984bb93c24a17228fd41058da7f039b54d6 (patch) | |
| tree | 553239ab39c7e1bee343db44ee725f60eb2ebe88 /config.hs | |
| parent | 279fe0fd88999919e70b07bda5f89f030dbfaaa1 (diff) | |
| parent | 6b6d11a7cd4eba3adbfd4e63469f968fcfcf5dc0 (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 |