X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhtsn.git;a=blobdiff_plain;f=src%2FConfiguration.hs;h=042cddbe0a5f137d9ac8eb8f207e31f76da58142;hp=49213c3f92d786ea2a24703d5780b192b04b997b;hb=60aea8c7765bf2382b1d24d039f3951e00434e3c;hpb=4833dc57c60f4aeaa160ec5e599507653a47809b diff --git a/src/Configuration.hs b/src/Configuration.hs index 49213c3..042cddb 100644 --- a/src/Configuration.hs +++ b/src/Configuration.hs @@ -49,9 +49,9 @@ instance Default Configuration where username = def } --- | Merge a Configuration with an OptionalConfiguration. This is more --- or less the Monoid instance for OptionalConfiguration, but since --- the two types are different, we have to repeat ourselves. +-- | Merge a 'Configuration' with an 'OptionalConfiguration'. This is +-- more or less the Monoid instance for 'OptionalConfiguration', but +-- since the two types are different, we have to repeat ourselves. merge_optional :: Configuration -> OC.OptionalConfiguration -> Configuration