[education/rkward/kf5] rkward/rbackend: Fix

[Thomas Friedrichsmeier]

Git commit 72ecf79ec80e92689b9744e8ea582c0396a2fcea by Thomas Friedrichsmeier.
Committed on 22/04/2025 at 12:05.
Pushed by tfry into branch 'kf5'.

Fix

M  +0    -6    rkward/rbackend/rkrbackend.cpp

https://invent.kde.org/education/rkward/-/commit/72ecf79ec80e92689b9744e8ea582c0396a2fcea

diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 5cf354060..d8e0f15db 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -1133,14 +1133,8 @@ bool RKRBackend::startR () {
 	R_registerRoutines (R_getEmbeddingDllInfo(), NULL, callMethods, NULL, NULL);
 
 	connectCallbacks();
-<<<<<<< HEAD
-	RKInsertToplevelStatementFinishedCallback (0);
-	RKREventLoop::setRKEventHandler (doPendingPriorityCommands);
-	default_global_context = R_GlobalContext;
-=======
 	RKREventLoop::setRKEventHandler(doPendingPriorityCommands);
 	default_global_context = ROb(R_GlobalContext);
->>>>>>> 11a555b04 (Adjust to the removal of Rf_addTaskCallback() in R (devel) 4.5)
 #ifdef Q_OS_WIN
 	// See the corresponding note in RWriteConsoleEx(). For auto-detecting UTF8 markers in console output.
 	win_do_detect_winutf8markers = true;