[education/rkward] rkward/dataeditor: fix merge

[Thomas Friedrichsmeier]

Git commit 1e0b3ac4ef6da1b4008538c9ec479a5dfe24bd84 by Thomas Friedrichsmeier.
Committed on 21/04/2022 at 12:27.
Pushed by tfry into branch 'master'.

fix merge

M  +0    -6    rkward/dataeditor/rkeditordataframe.cpp

https://invent.kde.org/education/rkward/commit/1e0b3ac4ef6da1b4008538c9ec479a5dfe24bd84

diff --git a/rkward/dataeditor/rkeditordataframe.cpp b/rkward/dataeditor/rkeditordataframe.cpp
index 76aca6cc..e8069be5 100644
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@ -106,14 +106,8 @@ void RKEditorDataFrame::rCommandDone (RCommand *command) {
 	RK_TRACE (EDITOR);
 
 	if (command->getFlags () == LOAD_COMPLETE_COMMAND) {
-<<<<<<< HEAD
 		RInterface::closeChain (open_chain);
 		open_chain = nullptr;
-=======
-		RKGlobals::rInterface ()->closeChain (open_chain);
-		open_chain = nullptr;
-
->>>>>>> releases/0.7.3
 		enableEditing (true);
 	}
 }