diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-06-10 14:59:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-10 14:59:40 -0400 |
| commit | 5608ab99f3aa058a196a7dfaf2b5ec123b5dad70 (patch) | |
| tree | 36fe833d85386ae8a4637e1956b4f2feba4687a0 /config.hs | |
| parent | e9a09eed901fc8ff40c7debef02fb6b0ed48b165 (diff) | |
| parent | e56d193951672bc13aca88b17704160703fcad8b (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 |