Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

2014-10-30 17:37:21 +01:00 · 2014-10-30 17:37:21 +01:00 · f6146eb71e
parent 83252851e6 170cedf26e
commit f6146eb71e
1 changed files with 2 additions and 5 deletions
--- a/js/apps/system/aardvark/test/specs/views/queryViewSpec.js
+++ b/js/apps/system/aardvark/test/specs/views/queryViewSpec.js
@ -65,11 +65,8 @@
     };

      view = new window.queryView({
-<<<<<<< HEAD
-        collection: queryCollection
-=======
-        collection: collectionDummy
->>>>>>> 626f37ad5b9851274fdeefc4a27f4da5b2623122
+        collection: queryCollection,
+        collection2: collectionDummy
      });

      window.modalView = new window.ModalView();