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