1 files changed, 0 insertions, 7 deletions
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
index daf012f1..3fadd1f2 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci
@@ -52,11 +52,7 @@ FunSizeAnnot = '';
 // ---------------------------------------------
 // --- Open the .sci file (read only). ---
 inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-<<<<<<< HEAD
 PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // #RNU_RES_B
 // --- Loop over the lines of the input file. ---
 // Position file pointer to the desired NInArg/NOutArg section,
@@ -216,9 +212,6 @@ mclose(inclsfid);
 // -------------------------------------------------
 // --- End Read the annotations of the function. ---
 // -------------------------------------------------
-<<<<<<< HEAD
 PrintStringInfo('  end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction