summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-09 23:53:12 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-09 23:53:12 +0200
commitc8cbff7c6b380321418f377130e5e25cf4a6f524 (patch)
tree98611eed9f4ba07d847ed33628fe2a2cd5ff5592 /system
parentef8005b5cda2f7acf930aa88b7380a36bd06721b (diff)
parent8fdda7907446db9ae2b9096a7caf361d4af98ce6 (diff)
Merged conflict.
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Form_validation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index fd95d76fa..a34809e05 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1378,4 +1378,4 @@ class CI_Form_validation {
// END Form Validation Class
/* End of file Form_validation.php */
-/* Location: ./system/libraries/Form_validation.php */ \ No newline at end of file
+/* Location: ./system/libraries/Form_validation.php */