From 0a73abdbc685a5722b2eb5285c4c1871d97003c0 Mon Sep 17 00:00:00 2001
From: neo_1993 <neo@tcraft.me>
Date: Tue, 25 Aug 2026 20:15:19 +0200
Subject: [PATCH] resolving merge conflicts

---
 Cargo.toml       | 2 +-
 src/array.rs     | 2 +-
 src/client.rs    | 4 ++--
 src/display.rs   | 4 ++--
 src/ffi.rs       | 4 ++--
 src/global.rs    | 4 ++--
 src/interface.rs | 4 ++--
 src/lib.rs       | 4 ++--
 src/list.rs      | 4 ++--
 src/resource.rs  | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2299bcb..0920b7d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,4 @@ name = "simple_compd"
 path = "examples/simple_compd.rs"
 
 [dependencies]
-libc = "*"
\ No newline at end of file
+libc = "*"
diff --git a/src/array.rs b/src/array.rs
index acdccdc..24caba0 100644
--- a/src/array.rs
+++ b/src/array.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::io::{Error, ErrorKind, Result};
 use std::ptr::NonNull;
diff --git a/src/client.rs b/src/client.rs
index fe51c89..d225154 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only 
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::io;
 use std::ptr::NonNull;
@@ -19,4 +19,4 @@ impl Wrapper for Client {
     fn get_raw(&self) -> std::ptr::NonNull<Self::T> {
         self.raw
     }
-}
\ No newline at end of file
+}
diff --git a/src/display.rs b/src/display.rs
index c064f9f..36e39ad 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::{io::Error, ptr::NonNull};
 use std::io::{ErrorKind, Result};
@@ -58,4 +58,4 @@ impl<'disp> Wrapper for Display<'disp> {
     fn get_raw(&self) -> std::ptr::NonNull<Self::T> {
         self.raw
     }
-}
\ No newline at end of file
+}
diff --git a/src/ffi.rs b/src/ffi.rs
index 84642ee..f7750a0 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::{ffi::CStr, os::fd::RawFd};
 
@@ -494,4 +494,4 @@ unsafe extern "C" {
     pub(crate) unsafe fn wl_shm_pool_unref(pool: *mut wl_shm_pool);
 
     pub(crate) unsafe fn wl_signal_emit_mutable(signal: *mut wl_signal, data: *mut libc::c_void);
-}
\ No newline at end of file
+}
diff --git a/src/global.rs b/src/global.rs
index fd9e4f6..f3b9e44 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::io;
 use std::ptr::NonNull;
@@ -58,4 +58,4 @@ impl Wrapper for Global {
     fn get_raw(&self) -> std::ptr::NonNull<Self::T> {
         self.raw
     }
-}
\ No newline at end of file
+}
diff --git a/src/interface.rs b/src/interface.rs
index be390c7..aaea098 100644
--- a/src/interface.rs
+++ b/src/interface.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only 
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::io;
 use std::marker::PhantomData;
@@ -61,4 +61,4 @@ impl<T: WaylandInterface> Interface<T> {
     pub(crate) fn get_raw(&self) -> NonNull<wl_interface> {
         T::raw_interface()
     }
-}
\ No newline at end of file
+}
diff --git a/src/lib.rs b/src/lib.rs
index 67a5bd9..b3bb488 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only
 
 pub(crate) mod ffi;
 
@@ -18,4 +18,4 @@ pub(crate) trait Wrapper {
     fn as_raw_ptr(&self) -> *mut Self::T {
         self.get_raw().as_ptr()
     }
-}
\ No newline at end of file
+}
diff --git a/src/list.rs b/src/list.rs
index d212beb..b5b0c3f 100644
--- a/src/list.rs
+++ b/src/list.rs
@@ -1,4 +1,4 @@
-// SPDX: GPL-2.0-only 
+// SPDX-License-Identifier: GPL-2.0-only
 
 use std::io;
 use std::ptr::NonNull;
@@ -46,4 +46,4 @@ impl Wrapper for List {
     fn get_raw(&self) -> std::ptr::NonNull<Self::T> {
         self.raw
     }
-}
\ No newline at end of file
+}
diff --git a/src/resource.rs b/src/resource.rs
index 95dc2b0..8fff01c 100644
--- a/src/resource.rs
+++ b/src/resource.rs
@@ -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
     }
-}
\ No newline at end of file
+}