@@ -1524,10 +1524,6 @@ packages:
15241524 # https://github.com/fpco/stackage/issues/836
15251525 - singletons < 1.2
15261526
1527−<<<<<<< HEAD
1528− # https://github.com/fpco/stackage/issues/839
1529− - freenect < 1.2.1
1530−
15311527 # https://github.com/amcphail/hmatrix-gsl-stats/issues/10
15321528 # https://github.com/amcphail/plot/issues/13
15331529 # https://github.com/amcphail/hmatrix-repa/issues/2
@@ -1552,8 +1548,6 @@ packages:
15521548 # https://github.com/fpco/stackage/issues/875
15531549 - ig < 0.6
15541550
1555−=======
1556−>>>>>>> parent of 009af5e... Upper bound for #839
15571551# Package flags are applied to individual packages, and override the values of
15581552# global-flags
15591553package-flags: