summaryrefslogtreecommitdiff
path: root/src/Propellor/Base.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-10 12:07:17 -0400
committerJoey Hess2016-05-10 12:07:17 -0400
commitc0b38a56ec9bdd85900fca3c040de85ef814bc1d (patch)
treec94269dad28df73698d6593d2462f84892092f54 /src/Propellor/Base.hs
parente4d412261c56696ab680bf607e3b7ca6182a0757 (diff)
parentfc75b2b9ab929f921512dafe69465106f497ad20 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Base.hs')
-rw-r--r--src/Propellor/Base.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Base.hs b/src/Propellor/Base.hs
index 2a0f5cbc..ef75bf03 100644
--- a/src/Propellor/Base.hs
+++ b/src/Propellor/Base.hs
@@ -47,7 +47,7 @@ import Propellor.PropAccum
import Propellor.Location
import Propellor.Utilities
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.IO
import System.FilePath
import Data.Maybe