[ARVADOS] updated: 1.3.0-869-g096134a96

[Git user]

Summary of changes:
 build/run-tests.sh | 4 ----
 1 file changed, 4 deletions(-)

       via  096134a964067c5dd2f3b3473f05b390fef8e7ab (commit)
      from  2887fa9c26cfd4ae6379e2cf4e6c5d50aaa0dd11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 096134a964067c5dd2f3b3473f05b390fef8e7ab
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed May 8 18:50:26 2019 -0300

    14988: Fixes merge conflict
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 68fc15183..2807d3c3a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1051,11 +1051,7 @@ test_gofmt() {
 test_services/api() {
     rm -f "$WORKSPACE/services/api/git-commit.version"
     cd "$WORKSPACE/services/api" \
-<<<<<<< HEAD
-        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec bin/rails test TESTOPTS='-v -d' ${testargs[services/api]}
-=======
         && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
->>>>>>> master
 }
 
 test_sdk/ruby() {

-----------------------------------------------------------------------


hooks/post-receive
--