summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Propellor/Base.hs2
-rw-r--r--src/Propellor/Types/ZFS.hs1
2 files changed, 2 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
diff --git a/src/Propellor/Types/ZFS.hs b/src/Propellor/Types/ZFS.hs
index 8784c641..3ce4b22c 100644
--- a/src/Propellor/Types/ZFS.hs
+++ b/src/Propellor/Types/ZFS.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE ConstrainedClassMethods #-}
-- | Types for ZFS Properties.
--
-- Copyright 2016 Evan Cofsky <evan@theunixman.com>