Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wow...fix conflict

This commit is contained in:
Andreas Streichardt 2016-07-27 13:34:19 +02:00
parent 8c0cb81a77
commit 738344bb67
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/client/modules/@arangodb/testing.js
View File

@ -2874,17 +2874,13 @@ testFuncs.http_replication = function (options) {
// / @brief TEST: http_server
// //////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
testFuncs.http_server = function (options) {
return rubyTests(options, false);
=======
testFuncs.http_server = function(options) {
var opts = {
"httpTrustedOrigin": "http://was-erlauben-strunz.it"
};
_.defaults(opts, options);
return rubyTests(opts, false);
>>>>>>> f4287f8... Fix trusted origin tests
};
// //////////////////////////////////////////////////////////////////////////////