From f7996820a2709a772f785bb429921cf1ab133777 Mon Sep 17 00:00:00 2001
From: Egor Masharskii <aym001@yandex.ru>
Date: Mon, 19 Aug 2024 08:32:05 +0000
Subject: [PATCH] fix definitions order

---
 cloud/filestore/libs/storage/core/config.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cloud/filestore/libs/storage/core/config.cpp b/cloud/filestore/libs/storage/core/config.cpp
index 8d17319a13..afe0c3ac58 100644
--- a/cloud/filestore/libs/storage/core/config.cpp
+++ b/cloud/filestore/libs/storage/core/config.cpp
@@ -178,11 +178,8 @@ using TAliases = NProto::TStorageConfig::TFilestoreAliases;
     xxx(NodeRegistrationCert,            TCertificate,          {}            )\
     xxx(NodeRegistrationToken,           TString,               "root@builtin")\
     xxx(NodeType,                        TString,               {}            )\
-<<<<<<< HEAD
     xxx(BlobCompressionRate,             ui32,                  0             )\
     xxx(BlobCompressionCodec,            TString,               "lz4"         )\
-=======
->>>>>>> fix build
 // FILESTORE_STORAGE_CONFIG
 
 #define FILESTORE_STORAGE_CONFIG_REF(xxx)                                      \