fixed leftover merged code

profile/unix/etc/pam.d/system-auth

@@ -11,14 +11,11 @@ account    required	pam_unix.so
 account    sufficient   pam_ldap.so
  
 #?pkg(cracklib)!=#
-<<<<<<< HEAD
-=======
 password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
 #pkg#
 #?pkg(passwdqc)!=#
 password   required	pam_passwdqc.so min=8,8,8,8,8 retry=3
 #pkg#
->>>>>>> py3_forced
 password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
 #pkg#
 #?pkg(passwdqc)!=#