diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
| commit | 33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (patch) | |
| tree | 0e9ff04c04c33cd1ba45171983d1b9f4d92cac60 /Utility/Format.hs | |
| parent | 2d7b57270e628994483495159d2be715c8f9531b (diff) | |
| parent | 49475bb89542e92c6f466425f29cd0640a8e80f4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Remote/S3.hs
Diffstat (limited to 'Utility/Format.hs')
| -rw-r--r-- | Utility/Format.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utility/Format.hs b/Utility/Format.hs index 2a5ae5c34..78620f9b9 100644 --- a/Utility/Format.hs +++ b/Utility/Format.hs @@ -117,7 +117,7 @@ decode_c s = unescape ("", s) handle (x:'x':n1:n2:rest) | isescape x && allhex = (fromhex, rest) where - allhex = isHexDigit n1 && isHexDigit n2 + allhex = isHexDigit n1 && isHexDigit n2 fromhex = [chr $ readhex [n1, n2]] readhex h = Prelude.read $ "0x" ++ h :: Int handle (x:n1:n2:n3:rest) |