diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-17 20:05:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 20:05:41 -0400 |
| commit | 88b1724713b91fb7458ca527916247d0d53b9560 (patch) | |
| tree | d74292d9e11b5660a1a650e7b3fc7aa0878fcc30 /config.hs | |
| parent | 312a9c3fc99ab16876b0edaf491a46c737d802b3 (diff) | |
| parent | d934c95b96ce5c770acf3482ab64383266cbb997 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config.hs')
| l--------- | config.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -config-simple.hs
\ No newline at end of file +config-joey.hs
\ No newline at end of file |