Remove rebase artifact

This commit is contained in:
Michael Snoyman 2015-05-06 06:57:59 +03:00
parent 76b25e903a
commit 592f19420d

View File

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