test to resolve conflicts 😄

emreakay · Jul 27, 2015 · 6474cdf · 6474cdf
1 parent 12a76b1
commit 6474cdf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/application/config/aauth.php b/application/config/aauth.php
@@ -42,8 +42,10 @@
 // remember time
 $config['aauth']['remember'] = ' +3 days';
 
-// pasword maximum char long (min is 4)
+// pasword maximum char long
 $config['aauth']['max'] = 24;
+// pasword minimum char long
+$config['aauth']['min'] = 5;
 
 // non alphanumeric characters that are allowed in a name
 $config['aauth']['valid_chars'] = array();