Remove merge conflicts

Signed-off-by: John Nunley <dev@notgull.net>
rust-windowing · Sep 10, 2023 · 07edc80 · 07edc80
1 parent 6e17a27
commit 07edc80
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/borrowed.rs b/src/borrowed.rs
@@ -257,13 +257,6 @@ impl<'a> WindowHandle<'a> {
     }
 }
 
-#[allow(deprecated)]
-unsafe impl crate::HasRawWindowHandle for WindowHandle<'_> {
-    fn raw_window_handle(&self) -> Result<RawWindowHandle, HandleError> {
-        Ok(self.raw)
-    }
-}
-
 impl AsRef<RawWindowHandle> for WindowHandle<'_> {
     fn as_ref(&self) -> &RawWindowHandle {
         &self.raw