Merged master

Author: pascalh

source/BNFC.cabal

@@ -56,13 +56,7 @@ Executable bnfc
     pretty >=1.1 && <1.2,
     filepath,
     deepseq,
-<<<<<<< 8ca1dcdab8cf1f9ee5b4c9567d30e95ec0a19b31
-    Cabal >= 1.18 && < 1.23
-=======
     Cabal >= 1.16 && < 1.23
-  if  impl(ghc < 7.6.1)
-    Build-depends: ghc-prim
->>>>>>> even cabal 1.16 should work
   build-tools:         alex, happy
   Main-is: Main.hs
   HS-source-dirs: src/