commit b8c038a3e7742f32915d7f1ab69627075e8d0c39
author Derek Jones <derek.jones@ellislab.com> Sat Aug 20 08:57:14 2011 -0500
committer Derek Jones <derek.jones@ellislab.com> Sat Aug 20 08:57:14 2011 -0500
tree 809872634daf234591fabacbca8df2203d35b509
parent 4c76272593d82f45761c24917e69b42983f26171

updated version number in user guide, removed some stray merge markers found in the change log

user_guide/helpers/text_helper.html

diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
index f71d878..496eccb 100644
--- a/user_guide/helpers/text_helper.html
+++ b/user_guide/helpers/text_helper.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>