merge

juleswritescode · juleswritescode · commit 3d4077502c34 · 2025-10-12T10:21:33.000+02:00
diff --git a/crates/pgt_statement_splitter/src/splitter/common.rs b/crates/pgt_statement_splitter/src/splitter/common.rs
@@ -15,7 +15,11 @@ pub struct ReachedEOFException;
 
 impl std::fmt::Display for ReachedEOFException {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+<<<<<<< HEAD
         write!(f, "ReachedEOFException")
+=======
+        write!(f, "SplitterException")
+>>>>>>> 44dc9893d66aeb13f31305902572a891aaf8b60c
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,11 @@ pub struct ReachedEOFException;`
`15`	`15`
`16`	`16`	`impl std::fmt::Display for ReachedEOFException {`
`17`	`17`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
	`18`	`+<<<<<<< HEAD`
`18`	`19`	`write!(f, "ReachedEOFException")`
	`20`	`+=======`
	`21`	`+ write!(f, "SplitterException")`
	`22`	`+>>>>>>> 44dc9893d66aeb13f31305902572a891aaf8b60c`
`19`	`23`	`}`
`20`	`24`	`}`
`21`	`25`