diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-25 15:30:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-25 15:30:54 -0400 |
| commit | 4f5ea9e647de942df53b7fcb0aa69729bd1b1454 (patch) | |
| tree | 7806b879fe5d07879f26f28deec5a10de67c41de /config.hs | |
| parent | 9c719f4f5e8b5bfdc0be3259cd3a30b02a345e82 (diff) | |
| parent | f01286bc4338dcb3942b3870d7a6ea69ca773265 (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 |