Commit 00aef344 authored by ijones's avatar ijones
Browse files

fixed conflict

parent df9a0b1f
......@@ -60,8 +60,16 @@ import qualified Distribution.Simple.Utils(hunitTests)
import Distribution.Simple.Configure()
import Distribution.Simple.Register()
import HUnit(runTestTT, Test(..))
-- base
import Control.Monad(when)
import Directory(setCurrentDirectory, doesFileExist,
doesDirectoryExist, removeDirectory)
import System.Cmd(system)
import System.Exit(ExitCode(..))
import HUnit(runTestTT, Test(..), Counts, assertBool)
label :: String -> String
label t = "-= " ++ t ++ " =-"
runTestTT' :: Test -> IO Counts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment