summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Klebinger <klebinger.andreas@gmx.at>2020-06-19 09:35:04 -0400
committerBen Gamari <ben@smart-cactus.org>2020-07-15 16:41:04 -0400
commitc88b1b9fde4eedcd1b62c51b1a53201ec3cf29c8 (patch)
tree52a5298f9f345da65079042b2b7ea7e81b174ec3
parent3cd4de46c1f31e2f044c671a4474126fc0d5a8da (diff)
downloadhaskell-c88b1b9fde4eedcd1b62c51b1a53201ec3cf29c8.tar.gz
winio: Fix openFile009 merge conflict leftover
-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