Clean up diff noise

mbassov · Jun 28, 2017 · 3829319 · 3829319
1 parent 59e4157
commit 3829319
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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
     }
   }