From 22da36bc0296c7a6a485eaa621e1d28accf8b26b Mon Sep 17 00:00:00 2001
From: Alex Chi <chi@neon.tech>
Date: Tue, 27 Jun 2023 10:04:21 -0400
Subject: [PATCH] fix merge conflicts

Signed-off-by: Alex Chi <chi@neon.tech>
---
 pageserver/src/tenant/timeline.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 544cfc2546..731ff167f5 100644
--- 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,