Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorHeikki Levanto <heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000 (13:45 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Fri, 7 Mar 2014 12:45:36 +0000 (13:45 +0100)
Conflicts:
test/spec/mkws-pazpar2.js

test/spec/mkws-pazpar2.js

index 104a606..e459931 100644 (file)
@@ -313,7 +313,6 @@ describe("Show record", function () {
     var record_number = 1; // the Nth record in hit list
     it("show record author", function () {
         $("div.mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
-
         // wait until the record pops up
         waitsFor(function () {
             var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div");