summaryrefslogtreecommitdiffstats
path: root/system/libraries/Cache/drivers/Cache_memcached.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-13 18:38:24 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-13 18:38:24 +0200
commit0eebc808cb298cdc6cd81be93de306a44c523e75 (patch)
tree837a7f92cead194db5892c61a45eca164e5af60e /system/libraries/Cache/drivers/Cache_memcached.php
parentb55050962bb731d1a99430cd37953e55434236a9 (diff)
parent686ff126762c0923556036a3cf73abb9390a7e67 (diff)
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Diffstat (limited to 'system/libraries/Cache/drivers/Cache_memcached.php')
-rw-r--r--system/libraries/Cache/drivers/Cache_memcached.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index fc586e025..747842091 100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
@@ -6,7 +6,7 @@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2006 - 2011 EllisLab, Inc.
+ * @copyright Copyright (c) 2006 - 2012 EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 2.0