diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-05 10:38:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-05 10:38:01 -0400 |
| commit | 6b54a846bbe82c4c413a2d5d9031895f38377754 (patch) | |
| tree | b7385c0526ccd95b6f80bd0004496da5e529bf39 /config.hs | |
| parent | 1e12a3a8c4fd0a5b027ff7923bb014b7836f8fd9 (diff) | |
| parent | 6f3a19973ef03c80d634d2cb64d2a72af4fb3548 (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 |