From c03ae4559a68376ef11f675c20461dcc939f9a08 Mon Sep 17 00:00:00 2001
From: Jeffrey Cameron <jeffreycameron@gmail.com>
Date: Thu, 19 Jan 2012 20:26:10 -0500
Subject: [PATCH] Removed the merge from the standard build path

---
 build-release.cmd => build.cmd | 0
 project.build                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename build-release.cmd => build.cmd (100%)

diff --git a/build-release.cmd b/build.cmd
similarity index 100%
rename from build-release.cmd
rename to build.cmd
diff --git a/project.build b/project.build
index 5f9014519..e08fd8e11 100644
--- a/project.build
+++ b/project.build
@@ -136,7 +136,7 @@
     </exec>
   </target>
   
-  <target name="zip" depends="merge">
+  <target name="zip" depends="test">
     <zip zipfile="${deploy.dir}\pickles-${version}.zip">
         <fileset basedir="${assemblies.console.dir}" prefix="pickles-${version}\exe">
             <include name="**/*" />