Changeset 2a301ff for libcfa/src/concurrency/alarm.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/alarm.hfa (modified) (2 diffs)

libcfa/src/concurrency/alarm.hfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 26 16:25:41 2018
-// Update Count     : 11
+// Last Modified On : Wed Aug 30 21:27:40 2023
+// Update Count     : 12
 //
 
@@ -23 +23 @@
 #include "time.hfa"
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 
 struct thread$;