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

---
 _config.php   | 12 +-----------
 composer.json |  5 ++---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/_config.php b/_config.php
index 348ca82..4f364ab 100644
--- a/_config.php
+++ b/_config.php
@@ -9,7 +9,6 @@
  * @package spamprotection
  */
 
-<<<<<<< HEAD
 /**
  * If the comments module is installed then add the spam protection module 
  * to the comments form via this extension.
@@ -17,13 +16,4 @@
  * Place this line in your mysite/_config.php
  */
 
-// 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
+// CommentingController::add_extension('CommentSpamProtection');
\ No newline at end of file
diff --git a/composer.json b/composer.json
index bea8d3d..62b1cd8 100644
--- a/composer.json
+++ b/composer.json
@@ -9,9 +9,8 @@
 	}, {
 		"name": "Will Rossiter",
 		"email": "will@fullscreen.io"
-	}
-	],
+	}],
 	"require": {
-		"silverstripe/framework": "3.*"
+		"silverstripe/framework": "3.1.*"
 	}
 }
\ No newline at end of file