Fixing merge issues.

2013-01-06 20:14:07 +00:00
parent abff7d8e7d de53feb07e
commit f0c3dbba40
8 changed files with 44 additions and 0 deletions
--- a/application/language/en/validation.php
+++ b/application/language/en/validation.php
@@ -36,6 +36,7 @@ return array(
 	"countbetween"   => "The :attribute must have between :min and :max selected elements.",
 	"countmax"       => "The :attribute must have less than :max selected elements.",
 	"countmin"       => "The :attribute must have at least :min selected elements.",
+	"date_format"	 => "The :attribute must have a valid date format.",
 	"different"      => "The :attribute and :other must be different.",
 	"email"          => "The :attribute format is invalid.",
 	"exists"         => "The selected :attribute is invalid.",