summaryrefslogtreecommitdiff
path: root/src/Propellor/Spin.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-10 15:17:15 -0400
committerJoey Hess2015-10-10 15:17:15 -0400
commit480a25aaa804208d76cd362c9a6bd222ec66dee6 (patch)
tree7fae0a11735caab29e5c1106a243d7527b25e3d8 /src/Propellor/Spin.hs
parent1799f634d89f588eeaef6ff2f6226adf5add3389 (diff)
parent63d653ee19b0f1bf2f4115d9f4ae9a93b00bae90 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Spin.hs')
-rw-r--r--src/Propellor/Spin.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index c5b31cef..ecefbf6e 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -16,7 +16,7 @@ import qualified Data.ByteString as B
import qualified Data.Set as S
import Network.Socket (getAddrInfo, defaultHints, AddrInfo(..), AddrInfoFlag(..), SockAddr)
-import Propellor
+import Propellor.Base
import Propellor.Protocol
import Propellor.PrivData.Paths
import Propellor.Git