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

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

This commit is contained in:
Jan Steemann 2014-10-30 17:37:21 +01:00
parent 83252851e6 170cedf26e
commit f6146eb71e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/apps/system/aardvark/test/specs/views/queryViewSpec.js
View File

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