diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-26 23:40:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-26 23:40:47 -0400 |
| commit | a9eac78268e28d7194d3f9f4a382ff6658defb0c (patch) | |
| tree | 9afc43cd3b71fb8ad47fd35c3e66440b54689406 /config.hs | |
| parent | 989cf9823fe5e5efb57d6a08da18bb46f548cdbe (diff) | |
| parent | 89816fb838873fc97ffa9d3827440bebb848c140 (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 |