diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:33:21 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-17 10:34:20 +0100 |
| commit | 8535440f6bebdf785683b4a62073f9465ca7e9cc (patch) | |
| tree | b2055ec8ec5f0a1e2387fc8448038d9877df5fbb /dev/lib/core | |
| parent | 3827ae4e821ff3758d1eaf2dbacc55a22f802731 (diff) | |
fix: fixing merge conflicts.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/lib/core')
| -rw-r--r-- | dev/lib/core/allocator_system.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/lib/core/allocator_system.hpp b/dev/lib/core/allocator_system.hpp index 6fd0119..1873064 100644 --- a/dev/lib/core/allocator_system.hpp +++ b/dev/lib/core/allocator_system.hpp @@ -71,4 +71,4 @@ namespace ocl using standard_allocator_type = allocator_system<type, new_op<type>, delete_op<type>>; } // namespace ocl -#endif // ifndef _OCL_ALLOCATOR_SYSTEM_HPP +#endif // ifndef _OCL_ALLOCATOR_SYSTEM_HPP
\ No newline at end of file |