Fixed merge conflict

This commit is contained in:
boltgolt 2018-04-14 00:11:39 +02:00
commit 3f7ab7de8c

View file

@ -15,7 +15,7 @@ dismiss_lockscreen = false
# Disable howdy in the PAM
# The howdy command will still function
disabled = false
disabled = false
[video]
# The certainty of the detected face belonging to the user of the account