Fix merge conflicts

This commit is contained in:
Lipu Fei 2019-03-26 16:33:13 +01:00
commit 56a3b2dfa7
3 changed files with 8 additions and 7 deletions

View file

@ -200,7 +200,7 @@ Item
onClicked:
{
// open the troubleshooting URL with web browser
var url = "https://ultimaker.com/incoming-links/cura/material-compatibilty" // TODO
const url = "https://ultimaker.com/en/resources/39129-network-troubleshooting-cura"
Qt.openUrlExternally(url)
}
onEntered: