fix merge conflicts

Signed-off-by: Alex Chi <chi@neon.tech>
2026-06-02 04:50:38 +00:00 · 2023-06-27 10:04:21 -04:00
parent 900ef3d92b
commit 22da36bc02
1 changed files with 4 additions and 1 deletions
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1504,7 +1504,10 @@ impl Timeline {
                timeline_id,
                tenant_id,
                pg_version,
-                layers: Arc::new(tokio::sync::RwLock::new((LayerMap::default()), LayerFileManager::new())),
+                layers: Arc::new(tokio::sync::RwLock::new((
+                    LayerMap::default(),
+                    LayerFileManager::new(),
+                ))),
                wanted_image_layers: Mutex::new(None),

                walredo_mgr,