diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 21:39:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 21:39:55 -0400 |
| commit | 3269dd8ffd621fa977cb108e0e6ad2671a7b6836 (patch) | |
| tree | 70e686ef46056984f27c0eccc9551253f08b3a46 /config.hs | |
| parent | c98285d957865aadaac3190543be1a1b3ae16476 (diff) | |
| parent | 3137c266b0082cf33d0cf747b2a2ea0929ca2d92 (diff) | |
Merge branch 'master' into wip
Diffstat (limited to 'config.hs')
| l--------- | config.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -config-joey.hs
\ No newline at end of file +config-simple.hs
\ No newline at end of file |