From 4ad952fe99d8ab4a7ea1109f8974315e94615556 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will.rossiter@gmail.com>
Date: Fri, 5 Apr 2013 21:13:05 +1300
Subject: [PATCH] Merged

---
 _config.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/_config.php b/_config.php
index 4d9ef57..348ca82 100644
--- a/_config.php
+++ b/_config.php
@@ -9,6 +9,7 @@
  * @package spamprotection
  */
 
+<<<<<<< HEAD
 /**
  * If the comments module is installed then add the spam protection module 
  * to the comments form via this extension.
@@ -16,4 +17,13 @@
  * Place this line in your mysite/_config.php
  */
 
-// Object::add_extension('CommentingController', 'CommentSpamProtection');
\ No newline at end of file
+// Object::add_extension('CommentingController', 'CommentSpamProtection');
+=======
+if(class_exists('Comment')) {
+	/**
+	 * If the comments module is installed then add the spam protection module 
+	 * to the comments form via this extension
+	 */
+	CommentingController::add_extension('CommentSpamProtection');
+}
+>>>>>>> FIX: 3.1 extension API updates