Revert freenect "Upper bound for #839" properly

This commit is contained in:
Jens Petersen 2015-10-05 13:17:54 +09:00
parent 778f040bea
commit acf3c3f700

View File

@ -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: