Missed merge

Corey · Corey · commit 3a65a9fe7917 · 2021-09-21T20:33:41.000Z
diff --git a/src/utils/tensorflow2/trainer.py b/src/utils/tensorflow2/trainer.py
@@ -57,10 +57,6 @@ def init_network(self):
             self.policy = mixed_precision.Policy('mixed_bfloat16')
             mixed_precision.set_policy(self.policy)
 
-<<<<<<< HEAD
-=======
-
->>>>>>> a9f393a1aad248abafcb146b9db37436b90ffc5f
         batch_dims = self.larcv_fetcher.batch_dims(1)
 
         # We compute the
