From 0f45be4ccd9ddcd3cbe2498e5e6cb9c839fc8355 Mon Sep 17 00:00:00 2001
From: wrossiter <wrossiter@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Mon, 14 Dec 2009 22:59:25 +0000
Subject: [PATCH] REVERTED: r95199

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@95206 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .mergesources.yml  | 12 +-----------
 mysite/_config.php |  2 --
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.mergesources.yml b/.mergesources.yml
index d9d7e2e..bc71aae 100644
--- a/.mergesources.yml
+++ b/.mergesources.yml
@@ -5,14 +5,4 @@ trunk:
   .: /open/phpinstaller/trunk
   sapphire: /open/modules/sapphire/trunk
   cms: /open/modules/cms/trunk
-  jsparty: /open/modules/jsparty/trunk
-
-wcc:
-  sapphire: /modules/sapphire/branches/2.4-wcc
-  cms: /modules/cms/branches/2.4-wcc
-  jsparty: /modules/jsparty/branches/2.4-wcc
-
-wc:
-  sapphire: /modules/sapphire/branches/2.3.1-womenconf
-  cms: /modules/cms/branches/2.3.1-womenconf
-  jsparty: /modules/jsparty/branches/2.3.1-womenconf
\ No newline at end of file
+  jsparty: /open/modules/jsparty/trunk
\ No newline at end of file
diff --git a/mysite/_config.php b/mysite/_config.php
index c1f46e8..d860264 100644
--- a/mysite/_config.php
+++ b/mysite/_config.php
@@ -16,5 +16,3 @@ SSViewer::set_theme('blackcandy');
 
 // enable nested URLs for this site (e.g. page/sub-page/)
 SiteTree::enable_nested_urls();
-
-MathSpamProtection::setEnabled(true);
\ No newline at end of file