[education/rkward] rkward/dataeditor: Merge branch 'releases/0.7.3'

[Thomas Friedrichsmeier]

Git commit 8aa42870200a25122e27aae53682cccadf453fc9 by Thomas Friedrichsmeier.
Committed on 21/04/2022 at 12:24.
Pushed by tfry into branch 'master'.

Merge branch 'releases/0.7.3'

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

https://invent.kde.org/education/rkward/commit/8aa42870200a25122e27aae53682cccadf453fc9

diff --cc rkward/dataeditor/rkeditordataframe.cpp
index e8069be5,2d16a51a..76aca6cc
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@@ -106,8 -107,9 +106,14 @@@ void RKEditorDataFrame::rCommandDone (R
  	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);
  	}
  }