diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-11-20 20:07:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-20 20:07:57 -0400 |
| commit | c47474d3a8ea926c185481acf4f0c21006b8d7ef (patch) | |
| tree | 5865446cbb2a0db104e722a3a3c946ee6c6133b8 /config.hs | |
| parent | 1178d210043894a87ee4cdb8cda00ca8da5883c5 (diff) | |
| parent | 42fafdc21313dff0e5d1972b457d5edcc589cfb0 (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 |