From 1150d2b06a8052b25a3f96467cef52c1aef3e70c Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Mon, 4 Apr 2016 15:11:10 +0200
Subject: [PATCH 1/2] Talk to coordinator

---
 js/client/modules/@arangodb/testing.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index 5fe0679945..c4f49cf800 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -745,7 +745,7 @@ function runThere(options, instanceInfo, file) {
     }
 
     httpOptions.returnBodyOnError = true;
-
+    
     const reply = download(instanceInfo.url + "/_admin/execute?returnAsJSON=true",
       testCode,
       httpOptions);
@@ -828,7 +828,6 @@ function performTests(options, testList, testname) {
         }
 
         print("\n" + Date() + " arangod: Trying", te, "...");
-
         let reply = runThere(options, instanceInfo, te);
 
         if (reply.hasOwnProperty('status')) {
@@ -1780,7 +1779,7 @@ function startInstance(protocol, options, addArgs, testname, tmpDir) {
     instanceInfo.url = url;
   } else {
     instanceInfo.urls = instanceInfo.endpoints.map(endpointToURL);
-    url = instanceInfo.urls[0];
+    url = instanceInfo.urls[instanceInfo.urls.length - 1];
     instanceInfo.url = url;
   }
 

From a2b8bb92f2bcf9e6be09ee7f997ba94b8784452b Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Mon, 4 Apr 2016 15:45:30 +0200
Subject: [PATCH 2/2] Oops...still conflicted

---
 arangod/Agency/Store.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arangod/Agency/Store.cpp b/arangod/Agency/Store.cpp
index 2efdf38b8e..beee701c38 100644
--- a/arangod/Agency/Store.cpp
+++ b/arangod/Agency/Store.cpp
@@ -637,10 +637,6 @@ void Store::clearTimeTable () {
       break;
     }
   }
-<<<<<<< HEAD
-=======
-
->>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
 }