Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (2 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master
Children:
950c58e
Parents:
92355883 (diff), 686912c (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:

Resolve conflict

File:
1 moved

Legend:

Unmodified
Added
Removed
  • libcfa/src/collections/array.hfa

    r92355883 r2a301ff  
    247247
    248248// desired:
    249 // trait ar(A &, Tv &, [N]) {
     249// forall(A &, Tv &, [N])
     250// trait ar {
    250251//     Tv& ?[?]( A&, zero_t );
    251252//     Tv& ?[?]( A&, one_t  );
Note: See TracChangeset for help on using the changeset viewer.