From d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 3 Mar 2011 11:23:09 -0800
Subject: [PATCH] resolve merge conflict.
---
build.sh | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/build.sh b/build.sh
index 31820f90582..625a09009b9 100755
--- a/build.sh
+++ b/build.sh
@@ -51,26 +51,7 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
-<<<<<<< local
- #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH"
- python develop.py \
- --incredibuild \
- --unattended \
- -t $variant \
- -G "$cmake_generator" \
- configure \
- -DGRID:STRING="$viewer_grid" \
- -DVIEWER_CHANNEL:STRING="$viewer_channel" \
- -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
- -DINSTALL_PROPRIETARY:BOOL=ON \
- -DRELEASE_CRASH_REPORTING:BOOL=ON \
- -DLOCALIZESETUP:BOOL=ON \
- -DPACKAGE:BOOL=ON \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
- -DLL_TESTS:BOOL="$run_tests"
-=======
- "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
->>>>>>> other
+ "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
end_section "Pre$variant"
}
--
GitLab