Remove git cruft

PLeVasseur · web-flow · commit d180c7599226 · 2025-12-16T21:27:54.000-05:00
diff --git a/src/coding-guidelines/types-and-traits/gui_UnionFieldValidity.rst.inc b/src/coding-guidelines/types-and-traits/gui_UnionFieldValidity.rst.inc
@@ -292,4 +292,3 @@
              | *Rust Unsafe Code Guidelines*, n.d. 
              | https://rust-lang.github.io/unsafe-code-guidelines/glossary.html#validity-and-safety-invariant.
 
->>>>>>> c93b2cb (Update types-and-traits.rst):src/coding-guidelines/types-and-traits.rst

Original file line number	Diff line number	Diff line change
`@@ -292,4 +292,3 @@`
`292`	`292`	`\| Rust Unsafe Code Guidelines, n.d.`
`293`	`293`	`\| https://rust-lang.github.io/unsafe-code-guidelines/glossary.html#validity-and-safety-invariant.`
`294`	`294`
`295`		`->>>>>>> c93b2cb (Update types-and-traits.rst):src/coding-guidelines/types-and-traits.rst`