From 3829319e08b0843cb822070b1edd52bfac0a6f51 Mon Sep 17 00:00:00 2001
From: Michael Bassovets <michael@curalate.com>
Date: Wed, 28 Jun 2017 10:15:01 -0700
Subject: [PATCH] Clean up diff noise

---
 src/caffe/layers/smooth_L1_loss_ohem_layer.cu | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/caffe/layers/smooth_L1_loss_ohem_layer.cu b/src/caffe/layers/smooth_L1_loss_ohem_layer.cu
index 5bee88c65ff..515c340b98e 100644
--- a/src/caffe/layers/smooth_L1_loss_ohem_layer.cu
+++ b/src/caffe/layers/smooth_L1_loss_ohem_layer.cu
@@ -123,10 +123,6 @@ namespace caffe {
           Dtype(0),                        // beta
           bottom[i]->mutable_gpu_diff());  // y
       }
-<<<<<<< HEAD
->>>>>>> 66d73988... Fix test issues
-=======
->>>>>>> d5f5bd5d... Fix code format issues
     }
   }