Bugfix

diff --git a/MABS_run_analyzer/ChargeSpektrumFunctions.c b/MABS_run_analyzer/ChargeSpektrumFunctions.c
index ec9ea9b1864784f62043d78920b2916b3aacf3f1..82c404b805a9c80b77532b919a2ef39c2c6589e3 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrumFunctions.c
+++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c
@@ -141,12 +141,7 @@ Bool_t writeObservableToFile()
             }
         }
     }
-<<<<<<< HEAD
     TString filename= runs[0]->savepathresults + "/" + ownpath + runnumberListe + "histograms.dat";
-=======
-    runnumberListe+=Form("%s_",plothistogrampointer->GetName());
-    TString filename= runs[0]->savepathresults + "/" + runnumberListe + "histograms.dat";
->>>>>>> without_FSBB
     fstream* fout = new fstream(filename,ios::out);
     *fout << headerInfo << endl;
     *fout << header << endl;