@@ -1521,6 +1521,7 @@ packages:
15211521 # https://github.com/fpco/stackage/issues/836
15221522 - singletons < 1.2
15231523
1524+<<<<<<< HEAD
15241525 # https://github.com/fpco/stackage/issues/839
15251526 - freenect < 1.2.1
15261527
@@ -1548,6 +1549,8 @@ packages:
15481549 # https://github.com/fpco/stackage/issues/875
15491550 - ig < 0.6
15501551
1552+=======
1553+>>>>>>> parent of 009af5e... Upper bound for #839
15511554# Package flags are applied to individual packages, and override the values of
15521555# global-flags
15531556package-flags: