Merge pull request BVLC#3 from curalate/dev-xxxx

Clean up diff noise
mbassov · Jun 28, 2017 · fad7550 · fad7550
2 parents 59e4157 + 3829319
commit fad7550
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
     }
   }