From e0df07950b101316c07ccec882ae00f930bca0c6 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 22 Jul 2011 16:11:34 -0600
Subject: Fixed conflict in changelog.

---
 user_guide/libraries/loader.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'user_guide/libraries')

diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 1d93af5ed..a472730ca 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -175,6 +175,12 @@ and merged into one array for conversion to variables.
 </p>
 
 
+<h2>$this->load->get_var(<samp>$key</samp>)</h2>
+
+<p>This function checks the associative array of variables available to your views. This is useful if for any reason a var is set in a library or another controller method using $this->load->vars().
+</p>
+
+
 <h2>$this->load->helper('<var>file_name</var>')</h2>
 <p>This function loads helper files, where <var>file_name</var> is the name of the file, without the <kbd>_helper.php</kbd> extension.</p>
 
-- 
cgit v1.2.3-24-g4f1b