- Fix compilation (merge conflict that was ignored instead of resolved)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9049 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 20, 2011 · f8c62c8 · f8c62c8
1 parent e998252
commit f8c62c8
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/c_runtime/interactive/omi_ResultManager.cpp b/c_runtime/interactive/omi_ResultManager.cpp
@@ -394,19 +394,11 @@ SimStepData* getResultDataFirstStart(){
  * the SRDF Organisation must start again from the beginning.
  * Because old simulation data mustn't send to the GUI.
  */
-<<<<<<< .mine
 void resetSRDFAfterChangetime() {
    if (debugResultManager)
    {
 	   cout << "ResultManager:\tFunct.: resetSRDFAfterChangetime\tMessage: START" << endl; fflush(stdout);
    }
-=======
-void resetSRDFAfterChangetime() {
-       if (debugResultManager)
-       {
-    	   cout << "ResultManager:\tFunct.: resetSRDFAfterChangetime\tMessage: START" << endl; fflush(stdout);
-       }
->>>>>>> .r9045
 
    pp_srdfArray_FirstQueueElement = srdfArrayOfPointer;
    pp_srdfArray_NextFreeSlot = srdfArrayOfPointer;