resolved conflict

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=108
This commit is contained in:
Factory Maintainer 2013-06-03 15:25:22 +00:00 committed by Git OBS Bridge
parent 859183f330
commit 0591e4b112
2 changed files with 6 additions and 1 deletions

View File

@ -9,4 +9,4 @@
# empty passwords are treated as locked accounts.
#
password requisite pam_cracklib.so
password required pam_unix.so use_authtok nullok try_first_pas
password required pam_unix.so use_authtok nullok try_first_pass

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 27 12:26:53 CEST 2013 - kukuk@suse.de
- Fix typo in common-password [bnc#821526]
-------------------------------------------------------------------
Fri Apr 26 10:25:06 UTC 2013 - mmeister@suse.com