diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-23 11:25:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-23 11:25:41 -0400 |
| commit | 9435ca9d7916c59fa37e2e4c3983dcd6eb20d8c0 (patch) | |
| tree | c7cea9fad8eb237f3aee7543fbcbc81b368cf7ef /config.hs | |
| parent | 7869b471f953c16fa73bc45f3651dba6138a1af6 (diff) | |
| parent | 864d47361ba34d851a9bbb34a6242854c042e556 (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 |