From 3e504ce2e3be44515c9dd7133087cb5b2df25ca5 Mon Sep 17 00:00:00 2001 From: Alan Plum Date: Tue, 15 Dec 2015 16:01:29 +0100 Subject: [PATCH 1/2] Resolve merge conflict --- .../frontend/js/modules/common/@arangodb/general-graph.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/common/@arangodb/general-graph.js b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/common/@arangodb/general-graph.js index d0d3b7b913..39ca779022 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/modules/common/@arangodb/general-graph.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/modules/common/@arangodb/general-graph.js @@ -29,12 +29,7 @@ module.define("@arangodb/general-graph", function(exports, module) { /// @author Copyright 2011-2014, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -<<<<<<< 821b807484cc4e848dd44a5c4153d613f21f56c1:js/common/modules/org/arangodb/general-graph.js -var arangodb = require("org/arangodb"), -======= - var arangodb = require("@arangodb"), ->>>>>>> org/arangodb -> @arangodb:js/apps/system/_admin/aardvark/APP/frontend/js/modules/common/@arangodb/general-graph.js internal = require("internal"), ArangoCollection = arangodb.ArangoCollection, ArangoError = arangodb.ArangoError, From 3c2fb7e43cfd0d72d722acf22e75fa0c9b053597 Mon Sep 17 00:00:00 2001 From: Alan Plum Date: Tue, 15 Dec 2015 16:03:18 +0100 Subject: [PATCH 2/2] Missed one --- arangod/V8Server/v8-collection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/V8Server/v8-collection.cpp b/arangod/V8Server/v8-collection.cpp index b0e5708953..6b9d248ec3 100644 --- a/arangod/V8Server/v8-collection.cpp +++ b/arangod/V8Server/v8-collection.cpp @@ -2459,7 +2459,7 @@ static int RenameGraphCollections (v8::Isolate* isolate, v8::HandleScope scope(isolate); StringBuffer buffer(TRI_UNKNOWN_MEM_ZONE); - buffer.appendText("require('org/arangodb/general-graph')._renameCollection(\""); + buffer.appendText("require('@arangodb/general-graph')._renameCollection(\""); buffer.appendJsonEncoded(oldName.c_str(), oldName.size()); buffer.appendText("\", \""); buffer.appendJsonEncoded(newName.c_str(), newName.size());