summaryrefslogtreecommitdiff
path: root/libraries/base/tests/IO/openFile009.hs
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/base/tests/IO/openFile009.hs')
-rw-r--r--libraries/base/tests/IO/openFile009.hs4
1 files changed, 0 insertions, 4 deletions
diff --git a/libraries/base/tests/IO/openFile009.hs b/libraries/base/tests/IO/openFile009.hs
index 7387d34c95..b3aa8c9f9b 100644
--- a/libraries/base/tests/IO/openFile009.hs
+++ b/libraries/base/tests/IO/openFile009.hs
@@ -17,7 +17,3 @@ main = do
hClose h
s <- readFile testfile
putStrLn s
-<<<<<<< HEAD
-
-=======
->>>>>>> 5f3eba6572... winio: Fix sqrt and openFile009 test cases