diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-24 13:56:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-24 13:56:39 -0400 |
| commit | b738aa54eed266d72669bcdafdbba7df6bc795fa (patch) | |
| tree | 47131d1ba25122e0642ef8966bc977f2b980b62c /config.hs | |
| parent | 5fc482fff3dcd9c809c275856adff1851b47160d (diff) | |
| parent | 4d3a3caa6bd3ebea92bdcf3122922c881a4b2a3a (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 |