commit 5025929d76172efd6dd3a7b0f4da7611a3df9391
author Phil Sturgeon <email@philsturgeon.co.uk> Fri Jul 15 15:25:15 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:18:39 2011 -0600
tree 0bdc47fdbdd520ac5f2cb6bb156f1d9c3974b9b7
parent 26b9ae2f500da7658074619af9c6dd982b77d0b8

Fixed conflicted changelog.

user_guide/changelog.html

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c1ee37f..95270fe 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,8 @@
 	<li>Libraries
 		<ul>
 			<li>Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.</li>
+			<li class="reactor">Added <kbd>is_unique</kbd> to the <a href="libraries/form_validation.html">Form Validation library</a>.</li>
+			<li class="reactor">Added <kbd>$this->db->set_dbprefix()</kbd> to the <a href="database/queries.html">Database Driver</a>.</li>
 		</ul>
 	</li>
 </ul>