X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailbox-count.git;a=blobdiff_plain;f=src%2FConfiguration.hs;h=8b6a7cefff41250266213a7a44bb753b82ed3db8;hp=e383abc263c0ee85878045c00f3293197cd6cb3a;hb=bc4c3efd191f3cc5b7b9f046775bff706c491a7d;hpb=7a6ba612bdec5ba940dc6f74143ca64a9163fff2 diff --git a/src/Configuration.hs b/src/Configuration.hs index e383abc..8b6a7ce 100644 --- a/src/Configuration.hs +++ b/src/Configuration.hs @@ -18,7 +18,6 @@ import qualified OptionalConfiguration as OC ( -- data Configuration = Configuration { - both :: Bool, database :: Maybe String, detail :: Bool, host :: Maybe String, @@ -31,7 +30,6 @@ data Configuration = -- values. instance Default Configuration where def = Configuration { - both = def, database = def, detail = def, host = def, @@ -47,7 +45,6 @@ merge_optional :: Configuration -> Configuration merge_optional cfg opt_cfg = Configuration - (merge (both cfg) (OC.both opt_cfg)) (OC.merge_maybes (database cfg) (OC.database opt_cfg)) (merge (detail cfg) (OC.detail opt_cfg)) (OC.merge_maybes (host cfg) (OC.host opt_cfg))