From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 20 Aug 2011 08:57:14 -0500 Subject: updated version number in user guide, removed some stray merge markers found in the change log --- user_guide/changelog.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5d5767b74..c52a33e5a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

@@ -60,7 +60,7 @@ Change Log

The Reactor Marker indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.

Version 2.0.3

-

Release Date: Not Released

+

Release Date: August 20, 2011

Version 2.0.2

-- cgit v1.2.3-24-g4f1b