From c700ca91758933eb993130a9cac429288c223d2f Mon Sep 17 00:00:00 2001
From: Hunter Long <info@socialeck.com>
Date: Mon, 25 Jun 2018 10:09:18 -0700
Subject: [PATCH] new

---
 .travis.yml | 2 +-
 build.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6755d8d6..23faf073 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ services:
 
 env:
   global:
-     - VERSION=0.241
+     - VERSION=0.242
 
 matrix:
   allow_failures:
diff --git a/build.sh b/build.sh
index 53bfce3a..db4ce298 100755
--- a/build.sh
+++ b/build.sh
@@ -49,7 +49,7 @@ body='{
   "request": {
     "branch":"master",
     "config": {
-      "merge_mode": "replace",
+      "merge_mode": "merge",
       "env": {
         "VERSION": "'"$VERSION"'"
       }