From 76b25e903aaedf16bb999cc5167917da3403e0e0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 6 May 2015 06:47:58 +0300
Subject: [PATCH] Remove expected test failure ekmett/machines#44

---
 build-constraints.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index c6f38900..35fa4d2a 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1307,12 +1307,10 @@ expected-test-failures:
     # https://github.com/haskell/haddock/issues/390 GHC 7.10
     - haddock-library
 
-    # https://github.com/ekmett/machines/issues/44 GHC 7.10
-    - machines
-
     # 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