diff options
| author | joe <joe@jerkface.net> | 2018-06-22 07:20:24 -0400 |
|---|---|---|
| committer | joe <joe@jerkface.net> | 2018-06-22 07:22:33 -0400 |
| commit | 40a8f0b6eb66bae93f8708dd84aaec57f7505c05 (patch) | |
| tree | e328f56dd88433a00814452e60ead88acfe13f3b /src/Data | |
| parent | 6bbc15735f6e28740c0e05fc8219fd83a5a464a4 (diff) | |
Forward port to nightly-2018-06-22.
Diffstat (limited to 'src/Data')
| -rw-r--r-- | src/Data/Torrent.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs index 4af583ed..dbe248eb 100644 --- a/src/Data/Torrent.hs +++ b/src/Data/Torrent.hs | |||
| @@ -147,7 +147,7 @@ module Data.Torrent | |||
| 147 | , renderURN | 147 | , renderURN |
| 148 | ) where | 148 | ) where |
| 149 | 149 | ||
| 150 | import Prelude | 150 | import Prelude hiding ((<>)) |
| 151 | import Control.Applicative | 151 | import Control.Applicative |
| 152 | import Control.DeepSeq | 152 | import Control.DeepSeq |
| 153 | import Control.Exception | 153 | import Control.Exception |