Resolve conflicts

tautschnig · tautschnig · commit 9f4a8362e982 · 2025-07-29T15:52:23.000Z
diff --git a/library/core/src/ffi/c_str.rs b/library/core/src/ffi/c_str.rs
@@ -192,7 +192,6 @@ impl Default for &CStr {
     }
 }
 
-<<<<<<< HEAD
 #[stable(feature = "frombyteswithnulerror_impls", since = "1.17.0")]
 impl fmt::Display for FromBytesWithNulError {
     #[allow(deprecated, deprecated_in_future)]
@@ -240,8 +239,6 @@ fn is_null_terminated(ptr: *const c_char) -> bool {
     found_null
 }
 
-=======
->>>>>>> subtree/library
 impl CStr {
     /// Wraps a raw C string with a safe C string wrapper.
     ///

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,6 @@ impl Default for &CStr {`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`-<<<<<<< HEAD`
`196`	`195`	`#[stable(feature = "frombyteswithnulerror_impls", since = "1.17.0")]`
`197`	`196`	`impl fmt::Display for FromBytesWithNulError {`
`198`	`197`	`#[allow(deprecated, deprecated_in_future)]`
`@@ -240,8 +239,6 @@ fn is_null_terminated(ptr: *const c_char) -> bool {`
`240`	`239`	`found_null`
`241`	`240`	`}`
`242`	`241`
`243`		`-=======`
`244`		`->>>>>>> subtree/library`
`245`	`242`	`impl CStr {`
`246`	`243`	`/// Wraps a raw C string with a safe C string wrapper.`
`247`	`244`	`///`