Merged

_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');

composer.json

@@ -9,9 +9,8 @@
 	}, {
 		"name": "Will Rossiter",
 		"email": "will@fullscreen.io"
-	}
-	],
+	}],
 	"require": {
-		"silverstripe/framework": "3.*"
+		"silverstripe/framework": "3.1.*"
 	}
 }