Skip to content
Snippets Groups Projects
Commit 5aca6756 authored by Lottie Greenwood's avatar Lottie Greenwood
Browse files

Re #16326 removed commented out code

parent c4d1fce8
No related merge requests found
......@@ -13437,7 +13437,11 @@ void ApplicationWindow::translateActionsStrings() {
actionHelpBugReports->setText(tr("Report a &Bug"));
actionAskHelp->setText(tr("Ask for Help"));
 
<<<<<<< HEAD
btnPointer->setText(tr("Selection &Tools"));
=======
btnPointer->setMenuText(tr("Selection &Tools"));
>>>>>>> Re #16326 removed commented out code
btnPointer->setToolTip(tr("Selection Tools"));
 
btnZoomIn->setText(tr("&Zoom In"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment