From 096ad32950281e6406e7c6f498dcd1629ff38d70 Mon Sep 17 00:00:00 2001
From: jcmartin <jcmartin@berkeley.edu>
Date: Tue, 10 Nov 2020 17:54:48 +0000
Subject: [PATCH] Fixed conflict marker in tensorflow-opgen.cabal

---
 tensorflow-opgen/tensorflow-opgen.cabal | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tensorflow-opgen/tensorflow-opgen.cabal b/tensorflow-opgen/tensorflow-opgen.cabal
index 6f3f0c6..564d38e 100644
--- 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