diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-03 14:33:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-03 14:33:35 -0400 |
| commit | c74f39843bd07fa86cfa2b1261912013caa05f55 (patch) | |
| tree | 3e7b9da0aac366371f49e2c422587db439fb5059 /Backend/SHA.hs | |
| parent | c5412ca7fed26dcc294c5873a07a28f174b255ce (diff) | |
| parent | 0064fc0beb98e7254dc026b614bad2e5518ea5dc (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
doc/tips/using_Amazon_S3.mdwn
Diffstat (limited to 'Backend/SHA.hs')
| -rw-r--r-- | Backend/SHA.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Backend/SHA.hs b/Backend/SHA.hs index 3adac65d8..c2a6cf976 100644 --- a/Backend/SHA.hs +++ b/Backend/SHA.hs @@ -45,7 +45,7 @@ genBackendE size = shaCommand :: SHASize -> Maybe String shaCommand 1 = SysConfig.sha1 -shaCommand 256 = SysConfig.sha256 +shaCommand 256 = Just SysConfig.sha256 shaCommand 224 = SysConfig.sha224 shaCommand 384 = SysConfig.sha384 shaCommand 512 = SysConfig.sha512 |