Merge conflict for some cabal files.

2020-11-10 11:07:32 +00:00 · 2020-11-10 11:07:32 +00:00 · 02304bbcdc
parent d7da5e524d c66c912c32
commit 02304bbcdc
1 changed files with 4 additions and 0 deletions
--- a/tensorflow-opgen/tensorflow-opgen.cabal
+++ b/tensorflow-opgen/tensorflow-opgen.cabal
@ -17,7 +17,11 @@ 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