From 1c75780da904b2a56c30c693fc3e03d2145614c2 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 6 Aug 2013 20:25:14 +0200
Subject: Fix a few more merge conflicts

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 44c6f16c5..f9beff36b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -403,7 +403,7 @@ Release Date: Not Released
    -  :doc:`Config Library <libraries/config>` changes include:
 
       -  Changed ``site_url()`` method  to accept an array as well.
-      -  Removed internal method ``_assign_to_config()`` and moved its implementation in *CodeIgniter.php* instead.
+      -  Removed internal method ``_assign_to_config()`` and moved its implementation to *CodeIgniter.php* instead.
 
    -  :doc:`Security Library <libraries/security>` changes include:
 
-- 
cgit v1.2.3-24-g4f1b