Changeset 2a301ff for tests/result.cfa


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 edited

Legend:

Unmodified
Added
Removed

  • tests/result.cfa

    r92355883 r2a301ff  
    1010// Created On       : Thr May 25 16:50:00 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Sep 25 15:22:59 2020
    13 // Update Count     : 2
     12// Last Modified On : Wed Aug 30 21:46:34 2023
     13// Update Count     : 3
    1414//
    1515
    1616#include <assert.h>
    17 #include <containers/result.hfa>
     17#include <collections/result.hfa>
    1818
    1919void checkPredicates() {
Note: See TracChangeset for help on using the changeset viewer.