diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-11 11:45:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-11 11:45:33 -0400 |
| commit | 0ea2e0b04e0cd541707e70caa1981e2a417bd01d (patch) | |
| tree | f314ce34c9356819bc7f1c58ccf1f7a59daabcc2 /config.hs | |
| parent | 071f914f56f776a825d32f627fca60e1a8494ec9 (diff) | |
| parent | 1bc6af50d3f649b1d1eb70fd8a4a9c8584e2361f (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 |