summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2016-05-22 15:55:27 -0400
committerJoey Hess2016-05-22 15:55:27 -0400
commitb5f9026a89602a441e717a167c3d753346172885 (patch)
treeda635a9ea77155dfcf150b13b88db044bf479c78 /src/Propellor
parent65ac730c006184472a7d0cb19deffdd69839530f (diff)
parent0dd63693b8938a1d9a1319811b3d8bdd1569c60f (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Base.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Base.hs b/src/Propellor/Base.hs
index ef75bf03..ae75589f 100644
--- a/src/Propellor/Base.hs
+++ b/src/Propellor/Base.hs
@@ -20,7 +20,7 @@ module Propellor.Base (
, module Propellor.Utilities
-- * System modules
- , module System.Directory
+ , module Utility.SystemDirectory
, module System.IO
, module System.FilePath
, module Data.Maybe
@@ -47,7 +47,7 @@ import Propellor.PropAccum
import Propellor.Location
import Propellor.Utilities
-import System.Directory hiding (isSymbolicLink)
+import Utility.SystemDirectory
import System.IO
import System.FilePath
import Data.Maybe