diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-05-03 12:25:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-05-03 12:25:48 -0400 |
| commit | 8f4a01225dbaf4d3f68ad0d94edab3f7650250ad (patch) | |
| tree | f08f8e3e79e813ba132c7195a62868ba17e829a6 /config.hs | |
| parent | 543aa510790b7b91c0c7dfc13fe41d8c80bc1f77 (diff) | |
| parent | 94653981cab8a9e0640a8ce3eee54a186479c1e5 (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 |