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

libcfa/src/concurrency/once.hfa

@@ -16 +16 @@
 #pragma once
 
-#include "containers/lockfree.hfa"
+#include "collections/lockfree.hfa"
 #include "kernel/fwd.hfa"