diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-05-15 20:12:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-15 20:12:08 -0400 |
| commit | d3b49aa149ea8ac9052b5b3d2a048206a7293301 (patch) | |
| tree | d1fd7e951fe508a2f38b79796e8522d5c20ede4b /config.hs | |
| parent | ba3bd76f4ade7ffeea3c1837f868f5264d284a8c (diff) | |
| parent | 8364547bf2b6a5e5184b2abc79938786d8efc55b (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 |