Changeset 2a301ff for libcfa/src/collections/pair.cfa

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:

• libcfa/src/collections/pair.cfa (moved) (moved from libcfa/src/containers/pair.cfa ) (1 diff)

libcfa/src/collections/pair.cfa

@@ -6 +6 @@
 // Author           : Aaron Moss
 // Created On       : Wed Apr 12 15:32:00 2017
-// Last Modified By : Aaron Moss
-// Last Modified On : Wed Apr 12 15:32:00 2017
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 30 21:27:12 2023
+// Update Count     : 2
 //
 
-#include <containers/pair.hfa>
+#include <collections/pair.hfa>
 
 forall(R, S