summaryrefslogtreecommitdiff
path: root/src/tutorials/tutorial_conflictresolution_main.js
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-06-27 12:07:54 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-06-27 12:07:54 -0400
commit38b9c7c060aeee46d463930e313683e6e5bc0675 (patch)
tree0311d2ea46ac60218f340923673b176fc0bbc635 /src/tutorials/tutorial_conflictresolution_main.js
parent27cffcb3aa12a460e6aa6d7eb4a6e5b10306a213 (diff)
parenta82b5de34adf50e46e3b1c80e9301b9d364fdb56 (diff)
Merge branch 'Develop' of https://github.com/ModOrganizer2/modorganizer into Develop
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 3c782af2..404afe5d 100644
--- a/src/tutorials/tutorial_conflictresolution_main.js
+++ b/src/tutorials/tutorial_conflictresolution_main.js
@@ -56,7 +56,7 @@ function getTutorialSteps() {
waitForClick()
},
function() {
- tutorial.text = qsTr("<img src=\"qrc:///MO/gui/emblem_conflict_redundant\" /> indicates that the mod is completely overwrtten by another. You could as well disable it.");
+ tutorial.text = qsTr("<img src=\"qrc:///MO/gui/emblem_conflict_redundant\" /> indicates that the mod is completely overwritten by another. You could as well disable it.");
waitForClick()
},
function() {