From 9b16a37984607aaa74ba915a66dcae47bc338821 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 30 Mar 2012 11:57:38 -0400
Subject: [PATCH] - nginx: merge function: default action is now to replace older locations in the nginx vhost configuration; a merge  instead of a replacement can be achieved by putting the string "##merge##" (without quotes) at the end of the most recent location line (e.g. "location ~ \.php$ { ##merge##").

---
 server/scripts/update_from_svn.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/server/scripts/update_from_svn.sh b/server/scripts/update_from_svn.sh
index becd7e7..d8ed236 100644
--- a/server/scripts/update_from_svn.sh
+++ b/server/scripts/update_from_svn.sh
@@ -5,4 +5,6 @@
 cd trunk/install
 php -q update.php
 cd /tmp
-rm -rf /tmp/trunk
\ No newline at end of file
+rm -rf /tmp/trunk
+
+exit 0
\ No newline at end of file

--
Gitblit v1.9.1