fix

nikvas0 · nikvas0 · commit 4e421a8fa31d · 2025-06-24T13:19:28.000+03:00
diff --git a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
@@ -115,10 +115,6 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
     {
         Target = creator;
 
-<<<<<<< HEAD
-        YQL_ENSURE(!TxManager || tableServiceConfig.GetEnableOltpSink());
-=======
->>>>>>> 3a99069cf36 (Fix sink flags (#19985))
         YQL_ENSURE(Request.IsolationLevel != NKikimrKqp::ISOLATION_LEVEL_UNDEFINED);
 
         if (Request.AcquireLocksTxId || Request.LocksOp == ELocksOp::Commit || Request.LocksOp == ELocksOp::Rollback) {

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,6 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da`
`115`	`115`	`{`
`116`	`116`	`Target = creator;`
`117`	`117`
`118`		`-<<<<<<< HEAD`
`119`		`- YQL_ENSURE(!TxManager \|\| tableServiceConfig.GetEnableOltpSink());`
`120`		`-=======`
`121`		`->>>>>>> 3a99069cf36 (Fix sink flags (#19985))`
`122`	`118`	`YQL_ENSURE(Request.IsolationLevel != NKikimrKqp::ISOLATION_LEVEL_UNDEFINED);`
`123`	`119`
`124`	`120`	`if (Request.AcquireLocksTxId \|\| Request.LocksOp == ELocksOp::Commit \|\| Request.LocksOp == ELocksOp::Rollback) {`