summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-21 17:12:46 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-21 17:12:46 -0400
commit80af78f48eb59fa33849eedc5779e3649328cde0 (patch)
tree6034ff3761f206c7cea50008fb9092bc43e81283 /Utility
parent4263eb776a3b81354c77d2a1b3fd997ed85f1c3c (diff)
parentae0059cac6a403cbeae66483a363fe64025beb69 (diff)
Merge branch 'master' into smudge
Diffstat (limited to 'Utility')
-rw-r--r--Utility/LockFile/PidLock.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs
index 086e771aa..53eb5a54f 100644
--- a/Utility/LockFile/PidLock.hs
+++ b/Utility/LockFile/PidLock.hs
@@ -31,11 +31,12 @@ import System.IO
import System.Posix
import Data.Maybe
import Data.List
-import Control.Applicative
import Network.BSD
import System.FilePath
import Data.Hash.MD5
import System.Directory
+import Control.Applicative
+import Prelude
type LockFile = FilePath