@@ -1310,7 +1310,6 @@ expected-test-failures:
1310 # https://github.com/ivanperez-keera/Yampa/issues/10
1310 # https://github.com/ivanperez-keera/Yampa/issues/10
1313−>>>>>>> Remove expected test failure ekmett/machines#44
1314# Haddocks which are expected to fail. Same concept as expected test failures.
1313# Haddocks which are expected to fail. Same concept as expected test failures.
1315expected-haddock-failures:
1314expected-haddock-failures:
1316 # https://github.com/acw/bytestring-progress/issues/4
1315 # https://github.com/acw/bytestring-progress/issues/4