@@ -1307,12 +1307,10 @@ expected-test-failures:
13071307 # https://github.com/haskell/haddock/issues/390 GHC 7.10
13081308 - haddock-library
13091309
1310− # https://github.com/ekmett/machines/issues/44 GHC 7.10
1311− - machines
1312−
13131310 # https://github.com/ivanperez-keera/Yampa/issues/10
13141311 - Yampa
13151312
1313+>>>>>>> Remove expected test failure ekmett/machines#44
13161314# Haddocks which are expected to fail. Same concept as expected test failures.
13171315expected-haddock-failures:
13181316 # https://github.com/acw/bytestring-progress/issues/4