Removed faulty lines at the beginning and end of file

2016-02-17 14:27:11 +01:00
parent 1c31fc88d0
commit 96ad763940
1 changed files with 0 additions and 2 deletions
--- a/src/tests/MuTransition/runMuSimulation.C
+++ b/src/tests/MuTransition/runMuSimulation.C
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /***************************************************************************

  runMuSimulation.C
@ -298,4 +297,3 @@ void runMuSimulation()

  delete [] histo;
 }
->>>>>>> 4fec25e423493c58fa21cedec161430f90ffc10d