another reminiscence of unresolved conflict

ecmwf · Feb 21, 2025 · db70275 · db70275
1 parent 1bbd29a
commit db70275
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/atlas/array/native/NativeDataStore.h b/src/atlas/array/native/NativeDataStore.h
@@ -368,13 +368,9 @@ class WrappedDataStore : public ArrayDataStore {
 
     void deallocateDevice() const override {
         if (device_allocated_) {
-<<<<<<< HEAD
             if (contiguous_) {
                 accUnmap();
             }
-=======
-            accUnmap();
->>>>>>> 45b83404b8e0a2d54c4ad009786dca7f808b5a0e
             device_allocator_.deallocate(device_data_, size_);
             device_data_ = nullptr;
             device_allocated_ = false;