LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

Removed faulty lines at the beginning and end of file

Browse Source
This commit is contained in:
Thomas Prokscha
2016-02-17 14:27:11 +01:00
parent 1c31fc88d0
commit 96ad763940
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/MuTransition/runMuSimulation.C
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
/*************************************************************************** /***************************************************************************
runMuSimulation.C runMuSimulation.C
@ -298,4 +297,3 @@ void runMuSimulation()
delete [] histo; delete [] histo;
} }
>>>>>>> 4fec25e423493c58fa21cedec161430f90ffc10d