summaryrefslogtreecommitdiffstats
path: root/user_guide/general/controllers.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-20 15:57:14 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-20 15:57:14 +0200
commitb8c038a3e7742f32915d7f1ab69627075e8d0c39 (patch)
tree809872634daf234591fabacbca8df2203d35b509 /user_guide/general/controllers.html
parent4c76272593d82f45761c24917e69b42983f26171 (diff)
updated version number in user guide, removed some stray merge markers found in the change log
Diffstat (limited to 'user_guide/general/controllers.html')
-rw-r--r--user_guide/general/controllers.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index c90916472..2d525141c 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -28,7 +28,7 @@
<div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
</tr>
</table>