mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-02-10 13:27:29 +01:00
Revert freenect "Upper bound for #839" properly
This commit is contained in:
parent
778f040bea
commit
acf3c3f700
@ -1524,10 +1524,6 @@ packages:
|
|||||||
# https://github.com/fpco/stackage/issues/836
|
# https://github.com/fpco/stackage/issues/836
|
||||||
- singletons < 1.2
|
- 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/hmatrix-gsl-stats/issues/10
|
||||||
# https://github.com/amcphail/plot/issues/13
|
# https://github.com/amcphail/plot/issues/13
|
||||||
# https://github.com/amcphail/hmatrix-repa/issues/2
|
# https://github.com/amcphail/hmatrix-repa/issues/2
|
||||||
@ -1552,8 +1548,6 @@ packages:
|
|||||||
# https://github.com/fpco/stackage/issues/875
|
# https://github.com/fpco/stackage/issues/875
|
||||||
- ig < 0.6
|
- ig < 0.6
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> parent of 009af5e... Upper bound for #839
|
|
||||||
# Package flags are applied to individual packages, and override the values of
|
# Package flags are applied to individual packages, and override the values of
|
||||||
# global-flags
|
# global-flags
|
||||||
package-flags:
|
package-flags:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user