Ignore:
Timestamp:
Mar 13, 2025, 9:26:17 AM (10 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
8b639f9
Parents:
3bd9508 (diff), 594671a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

fix pull conflicit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.yy

    r3bd9508 r3e91c6f9  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Mar  3 20:47:00 2025
    13 // Update Count     : 7254
     12// Last Modified On : Thu Mar 13 09:23:21 2025
     13// Update Count     : 7255
    1414//
    1515
     
    22442244        basic_type_specifier
    22452245        | sue_type_specifier
    2246         | type_type_specifier
     2246        | type_type_specifier attribute_list_opt
    22472247        ;
    22482248
Note: See TracChangeset for help on using the changeset viewer.