Changeset 2a301ff for libcfa/src/concurrency/kernel.hfa

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/concurrency/kernel.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 12:29:26 2020
-// Update Count     : 22
+// Last Modified On : Wed Aug 30 21:28:46 2023
+// Update Count     : 23
 //
 
@@ -20 +20 @@
 #include "coroutine.hfa"
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 
 extern "C" {