Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1

1 files changed, 1 insertions, 1 deletions

diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 0223bd5d7..f333199ac 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -245,7 +245,7 @@ Previous Topic:&nbsp;&nbsp;<a href="unit_testing.html">Unit Testing Class</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="user_agent.html">User Agent Class</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2012 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>