chore: resolve conflicts

GreptimeTeam · Jan 3, 2024 · 4b89fd6 · 4b89fd6
1 parent 075ae32
commit 4b89fd6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/mito2/src/error.rs b/src/mito2/src/error.rs
@@ -434,6 +434,7 @@ pub enum Error {
         region_id: RegionId,
         flushed_entry_id: u64,
         unexpected_entry_id: u64,
+    },
 
     #[snafu(display("Column not found, column: {column}"))]
     ColumnNotFound { column: String, location: Location },