add ydb patch

ydb-platform · Nov 19, 2024 · 699f29f · 699f29f
1 parent ffe2e61
commit 699f29f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/contrib/ydb/core/blobstorage/dsproxy/dsproxy_request.cpp b/contrib/ydb/core/blobstorage/dsproxy/dsproxy_request.cpp
@@ -13,7 +13,10 @@ namespace NKikimr {
             ActiveRequests.try_emplace(actorId);
         }
     }
+<<<<<<< HEAD
 
+=======
+>>>>>>> add ydb patch
     void TBlobStorageGroupProxy::CheckDeadlines() {
         const TInstant now = TActivationContext::Now();
         std::multimap<TInstant, TActorId>::iterator it;