Fix merge
commitc38e359b97fa608de90e92bf8dd0be574240d922
authorJosh Arenson <joshua.arenson@canonical.com>
dateMon 27 Jun 2016, 11:09 (10 years ago)
parent0007543
qml/Greeter/Greeter.qml+1−1
@@ -449,8 +449,8 @@ Showable {
449449 d.waiting = false;
450450
451451 if (LightDMService.greeter.authenticated) {
452− d.login();
453452 if (!LightDMService.greeter.promptless) {
453+ d.login();
454454 loader.item.hide();
455455 }
456456 } else {