diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-02 19:04:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-02 19:04:43 -0400 |
| commit | dfd95122ccb70d867995b133845eb4b63c054d1b (patch) | |
| tree | 011318acc6ab8bbb5b94b1fd9b34365bdd61eb0a /config.hs | |
| parent | 42d648723d79a116e5fbf840af095c517818cf58 (diff) | |
| parent | e83fccd24947c0dad36b079b3acd4d645edac01b (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 |