diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:06:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:06:08 -0400 |
| commit | bb32fad83db093c30ee6132c5d982cc25fe89bda (patch) | |
| tree | c106cf941167fa16f9489ba2f49410dc38d814af /src/Propellor/Property/Parted | |
| parent | 345536941eeec4a4562222408d9f4326ce9b2645 (diff) | |
| parent | 14fe4c4d6b5a29be94ecfc0572e0f9a9a081e795 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Parted')
| -rw-r--r-- | src/Propellor/Property/Parted/Types.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Parted/Types.hs b/src/Propellor/Property/Parted/Types.hs index 5891cc16..11e0947c 100644 --- a/src/Propellor/Property/Parted/Types.hs +++ b/src/Propellor/Property/Parted/Types.hs @@ -31,7 +31,7 @@ instance Sem.Semigroup PartTable where instance Monoid PartTable where -- | default TableType is MSDOS, with a `safeAlignment`. mempty = PartTable MSDOS safeAlignment [] - mappend = (<>) + mappend = (Sem.<>) -- | A partition on the disk. data Partition = Partition @@ -93,7 +93,7 @@ instance Sem.Semigroup PartSize where instance Monoid PartSize where mempty = MegaBytes 0 - mappend = (<>) + mappend = (Sem.<>) reducePartSize :: PartSize -> PartSize -> PartSize reducePartSize (MegaBytes a) (MegaBytes b) = MegaBytes (a - b) |