From acf3c3f70015fd10a82084184d36431aaaba8d49 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Oct 2015 13:17:54 +0900 Subject: [PATCH] Revert freenect "Upper bound for #839" properly --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 480db5f6..751068cd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1524,10 +1524,6 @@ packages: # https://github.com/fpco/stackage/issues/836 - singletons < 1.2 -<<<<<<< HEAD - # https://github.com/fpco/stackage/issues/839 - - freenect < 1.2.1 - # https://github.com/amcphail/hmatrix-gsl-stats/issues/10 # https://github.com/amcphail/plot/issues/13 # https://github.com/amcphail/hmatrix-repa/issues/2 @@ -1552,8 +1548,6 @@ packages: # https://github.com/fpco/stackage/issues/875 - ig < 0.6 -======= ->>>>>>> parent of 009af5e... Upper bound for #839 # Package flags are applied to individual packages, and override the values of # global-flags package-flags: