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/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'user_guide/overview') diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index bcbc43ff8..c6bf857b4 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index b6b81d760..641c04b22 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 1c58c584f..b7b10b90c 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index e20219e0f..5f71c5083 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index f120913f4..2b6b3f288 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 754ecaae0..6acaa65a2 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index bbe3e36f3..08e61e283 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 91cf64977..4721cbf67 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3

-- cgit v1.2.3-24-g4f1b