summaryrefslogtreecommitdiff
path: root/src/tutorials/tutorial_conflictresolution_main.js
diff options
context:
space:
mode:
authorBrian Munro <brian.alexander.munro@gmail.com>2018-04-13 11:56:36 +0200
committerGitHub <noreply@github.com>2018-04-13 11:56:36 +0200
commitbc75009169ecbf378fa90891dc8183a8cb3ef499 (patch)
tree221f74cbaeea3750bd705a6a37ff8242e4cef192 /src/tutorials/tutorial_conflictresolution_main.js
parentd6aab781ee1d5b927ccf06100e74539a980ee83f (diff)
parent8be73d2e3b0af9cb99616d31418a0d9c74aca466 (diff)
Merge pull request #294 from Modorganizer2/Develop
Release 2.1.2
Diffstat (limited to 'src/tutorials/tutorial_conflictresolution_main.js')
-rw-r--r--src/tutorials/tutorial_conflictresolution_main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tutorials/tutorial_conflictresolution_main.js b/src/tutorials/tutorial_conflictresolution_main.js
index a60a5c8d..3c782af2 100644
--- a/src/tutorials/tutorial_conflictresolution_main.js
+++ b/src/tutorials/tutorial_conflictresolution_main.js
@@ -65,7 +65,7 @@ function getTutorialSteps() {
},
function() {
tutorial.text = qsTr("Option A: Switch to the \"Data\"-tab if necessary")
- if (!tutorialControl.waitForTabOpen("tabWidget", 1)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", 2)) {
highlightItem("tabWidget", false)
waitForClick()
} else {