Fixed conflict marker in tensorflow-opgen.cabal

2020-11-10 17:54:48 +00:00 · 2020-11-10 17:54:48 +00:00 · 096ad32950
parent 02304bbcdc
commit 096ad32950
1 changed files with 0 additions and 4 deletions
--- a/tensorflow-opgen/tensorflow-opgen.cabal
+++ b/tensorflow-opgen/tensorflow-opgen.cabal
@ -17,11 +17,7 @@ library
  exposed-modules:     TensorFlow.OpGen.ParsedOp
                     , TensorFlow.OpGen
  build-depends:  proto-lens == 0.7.*
-<<<<<<< HEAD
                , tensorflow-proto == 0.3.*
-=======
-                , tensorflow-proto == 0.2.*
->>>>>>> c66c912c327810796b6282ae77c33e336c1dadea
                , base >= 4.7 && < 5
                , bytestring
                , containers