summaryrefslogtreecommitdiffhomepage
path: root/Types/Storage.hs
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-02-17 08:37:05 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-02-17 08:37:05 -0700
commit0fc5c49d067747c97f6e774001df67b27a304983 (patch)
tree6e59b61894adf77a2fbaf8a257690a672dec6a90 /Types/Storage.hs
parentf9f821b71530dbcab61b96b589e6e87e8952e198 (diff)
parentde59756b62fdb8045217e3474f2528bcb48508ed (diff)
downloadkeysafe-0fc5c49d067747c97f6e774001df67b27a304983.tar.gz
Merge tag '0.20200214'
tagging package keysafe version 0.20200214 # gpg: Signature made Fri 14 Feb 2020 10:39:08 AM MST # gpg: using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38 # gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [full] # Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7 # Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C 0F25 DB12 DB0F F05F 8F38
Diffstat (limited to 'Types/Storage.hs')
-rw-r--r--Types/Storage.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Types/Storage.hs b/Types/Storage.hs
index c83593a..c145812 100644
--- a/Types/Storage.hs
+++ b/Types/Storage.hs
@@ -16,7 +16,7 @@ import Data.Aeson.Types
-- | All known locations where shares can be stored, ordered with
-- preferred locations first.
newtype StorageLocations = StorageLocations [Storage]
- deriving (Monoid)
+ deriving (Monoid, Semigroup)
newtype LocalStorageDirectory = LocalStorageDirectory FilePath