Removed .mergesources.yml, not used since the dark SVN days

.htaccess

@@ -20,14 +20,10 @@ ErrorDocument 500 /assets/error-500.html
 <IfModule mod_rewrite.c>
 	SetEnv HTTP_MOD_REWRITE On
 	RewriteEngine On
+	RewriteBase '/ss-3.0'
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule .* framework/main.php?url=%1 [QSA]
-
-	RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule . %1/install.php? [R,L]
-
+	RewriteRule .* framework/main.php?url=%1&%{QUERY_STRING} [L]
 </IfModule>
 ### SILVERSTRIPE END ###

.mergesources.yml

@@ -1,11 +0,0 @@
-# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
-# Keeps track of all opensource branches of submodules 
-# that could be merged back to the current submodule paths.
-2.3:
-  .: /open/phpinstaller/branches/2.3
-  sapphire: /open/modules/sapphire/branches/2.3
-  cms: /open/modules/cms/branches/2.3
-2.4:
-  .: /open/phpinstaller/branches/2.4
-  sapphire: /open/modules/sapphire/branches/2.4
-  cms: /open/modules/cms/branches/2.4

mysite/_config.php

@@ -1,18 +1,21 @@
-<?php
-
-global $project;
-$project = 'mysite';
-
-global $database;
-$database = '';
-
-require_once('conf/ConfigureFromEnv.php');
-
-MySQLDatabase::set_connection_charset('utf8');
-
-// Set the current theme. More themes can be downloaded from
-// http://www.silverstripe.org/themes/
-SSViewer::set_theme('simple');
-
-// Enable nested URLs for this site (e.g. page/sub-page/)
-if(class_exists('SiteTree')) SiteTree::enable_nested_urls();
+<?php
+
+global $project;
+$project = 'mysite';
+
+global $database;
+$database = 'SS_ss30';
+
+require_once('conf/ConfigureFromEnv.php');
+
+MySQLDatabase::set_connection_charset('utf8');
+
+// Set the current theme. More themes can be downloaded from
+// http://www.silverstripe.org/themes/
+SSViewer::set_theme('simple');
+
+// Set the site locale
+i18n::set_locale('en_US');
+
+// Enable nested URLs for this site (e.g. page/sub-page/)
+if (class_exists('SiteTree')) SiteTree::enable_nested_urls();

mysite/code/Page.php

@@ -7,6 +7,14 @@ class Page extends SiteTree {
 	public static $has_one = array(
 	);
 
+	function getCMSFields() {
+		$fields = parent::getCMSFields();
+		$fields->findOrMakeTab('Root.Bla.Foo1');
+		$fields->findOrMakeTab('Root.Bla.Foo2');
+
+		return $fields;
+	}
+
 }
 class Page_Controller extends ContentController {