resolving merge conflicts

2026-08-25 20:15:19 +02:00
parent 61cfcf283f
commit 0a73abdbc6
10 changed files with 18 additions and 18 deletions
@@ -1,4 +1,4 @@
-//SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only

 use std::io;
 use std::ptr::NonNull;
@@ -36,4 +36,4 @@ impl Wrapper for Resource {
    fn get_raw(&self) -> std::ptr::NonNull<Self::T> {
        self.raw
    }
-}
+}