From ed4bb3073fa3b3494fb19e02540770f9ab6e4bde Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@neon.tech>
Date: Thu, 7 Dec 2023 08:20:22 +0200
Subject: [PATCH] Resolve merge conflict

---
 pageserver/src/tenant/storage_layer/image_layer.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs
index 67dcbef798..cd226c2e20 100644
--- a/pageserver/src/tenant/storage_layer/image_layer.rs
+++ b/pageserver/src/tenant/storage_layer/image_layer.rs
@@ -47,6 +47,7 @@ use camino::{Utf8Path, Utf8PathBuf};
 use hex;
 use pageserver_api::keyspace::KeySpace;
 use lz4_flex;
+use pageserver_api::key::is_rel_data_key;
 use pageserver_api::models::LayerAccessKind;
 use pageserver_api::shard::TenantShardId;
 use postgres_ffi::BLCKSZ;