From 0681a2f396e69cd60238d0e77a2d857af5865252 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Johannes=20Dahlstr=C3=B6m?= <johannes.dahlstrom@vaadin.com>
Date: Tue, 13 Mar 2012 09:42:58 +0000
Subject: [PATCH] Reverted accidental commit

svn changeset:23229/svn branch:6.8
---
 build/build.xml  | 2 +-
 scripts/merge.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index aee3dc7bed..1fdcc0ee25 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -542,7 +542,7 @@
     <target name="compile-widgetset" description="Compiles the widgetset given as the first parameter">
         <fail unless="widgetset" message="No widgetset parameter set"/>
         <property name="widgetset-style" value="OBF" />
-    	<property name="widgetset-localWorkers" value="1" />
+    	<property name="widgetset-localWorkers" value="4" />
     	<property name="widgetset-extraParams" value="" />
         <echo>Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir}</echo>
         <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m">
diff --git a/scripts/merge.sh b/scripts/merge.sh
index 9125a505b7..a8c356ad30 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -13,14 +13,14 @@ localchanges=`svn stat|wc -l`
 if [ "$localchanges" != "0" ]
 then
 	echo "You must have a clean working space copy"
-	#exit 2
+	exit 2
 fi
 
 if [ "$SVN_PASS_FILE" != "" ]
 then
        SVN_PASS=`cat "$SVN_PASS_FILE"`
 fi
-
+       
 svn up
 
 currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"`
-- 
2.39.5