diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
| commit | dcae58d6262117122dc8af0a0e6fc63ed2c25c88 (patch) | |
| tree | c394be44bd65b8e4b7be4d8c90e3608400e148fc /config.hs | |
| parent | c0a2701284a800f55abdd61f0b8619582c399a9e (diff) | |
| parent | ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (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 |