fix

Parsers/PascalABCParserNewSaushkin/ABCPascal.cs

@@ -1,15 +1,9 @@
 //
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
-<<<<<<< HEAD
 //  Machine:  DESKTOP-2BJCJ7I
-//  DateTime: 03.04.2021 16:57:10
+//  DateTime: 03.04.2021 17:04:09
 //  UserName: ibond
-=======
-//  Machine:  DESKTOP-G8V08V4
-//  DateTime: 03.04.2021 6:32:31
-//  UserName: ?????????
->>>>>>> e8a2eb27fd41e7541b25a2811d8d787fd312c080
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
 //

Parsers/PascalABCParserNewSaushkin/ABCPascal.y

@@ -111,11 +111,7 @@
 %type <stn> literal_list  
 %type <stn> label_decl_sect  
 %type <stn> lock_stmt  
-<<<<<<< HEAD
 %type <stn> func_name proc_name optional_proc_name
-=======
-%type <stn> func_name proc_name optional_proc_name //qualified_identifier 
->>>>>>> e8a2eb27fd41e7541b25a2811d8d787fd312c080
 %type <ex> new_expr allowable_expr_as_stmt  
 %type <stn> parse_goal parts inclass_block block proc_func_external_block
 %type <td> exception_class_type_identifier simple_type_identifier //idp  
@@ -2023,24 +2019,6 @@ optional_proc_name
 		{ $$ = null; }
     ;
 
-<<<<<<< HEAD
-=======
-//qualified_identifier
-//    : identifier                                       
-//        { $$ = new method_name(null,null,$1,null,@$); }
-//    | visibility_specifier                             
-//        { $$ = new method_name(null,null,$1,null,@$); }
-//    | qualified_identifier tkPoint identifier                   
-//        {
-//			$$ = NewQualifiedIdentifier($1 as method_name, $3, @$);
-//        }
-//    | qualified_identifier tkPoint visibility_specifier         
-//        {
-//			$$ = NewQualifiedIdentifier($1 as method_name, $3, @$);
-//        }
-//    ;
->>>>>>> e8a2eb27fd41e7541b25a2811d8d787fd312c080
-
 property_definition
     : attribute_declarations simple_property_definition
         {  

Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs

@@ -1,17 +1,10 @@
 // (see accompanying GPPGcopyright.rtf)
 
 // GPPG version 1.3.6
-<<<<<<< HEAD
 // Machine:  DESKTOP-2BJCJ7I
-// DateTime: 03.04.2021 16:57:11
+// DateTime: 03.04.2021 17:04:10
 // UserName: ibond
 // Input file <ABCPascal.y>
-=======
-// Machine:  DESKTOP-G8V08V4
-// DateTime: 03.04.2021 6:32:31
-// UserName: ?????????
-// Input file <D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y>
->>>>>>> e8a2eb27fd41e7541b25a2811d8d787fd312c080
 
 // options: no-lines gplex
 
@@ -66,7 +59,7 @@ public abstract class ScanBase : AbstractScanner<PascalABCSavParser.Union,LexLoc
 
 public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, LexLocation>
 {
-  // Verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
+  // Verbatim content from ABCPascal.y
 // <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> GPPGParser, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> gppg
     public syntax_tree_node root; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
 
@@ -78,7 +71,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
 	public ParserLambdaHelper lambdaHelper = new ParserLambdaHelper();
 	
     public GPPGParser(AbstractScanner<PascalABCSavParser.Union, LexLocation> scanner) : base(scanner) { }
-  // End verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
+  // End verbatim content from ABCPascal.y
 
 #pragma warning disable 649
   private static Dictionary<int, string> aliasses;