resolve conflict

risingwavelabs · Sep 20, 2024 · 9ac370b · 9ac370b
1 parent bb70312
commit 9ac370b
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/storage/hummock_sdk/src/frontend_version.rs b/src/storage/hummock_sdk/src/frontend_version.rs
@@ -67,7 +67,6 @@ impl FrontendHummockVersion {
             id: self.id.0,
             levels: Default::default(),
             max_committed_epoch: self.max_committed_epoch,
-            safe_epoch: 0,
             table_watermarks: Default::default(),
             table_change_logs: self
                 .table_change_log
@@ -185,7 +184,6 @@ impl FrontendHummockVersionDelta {
             prev_id: self.prev_id.to_u64(),
             group_deltas: Default::default(),
             max_committed_epoch: self.max_committed_epoch,
-            safe_epoch: 0,
             trivial_move: false,
             new_table_watermarks: Default::default(),
             removed_table_ids: self