Fix merge conflicts

2014-05-22 11:15:04 -04:00
parent cd862b3253
commit 240fcc1d5a
19 changed files with 24 additions and 349 deletions
--- a/cms/static/js/spec_helpers/edit_helpers.js
+++ b/cms/static/js/spec_helpers/edit_helpers.js
@@ -94,7 +94,7 @@ define(["jquery", "underscore", "js/spec_helpers/create_sinon", "js/spec_helpers
        verifyXBlockRequest = function (requests, expectedJson) {
            var request = requests[requests.length - 1],
                actualJson = JSON.parse(request.requestBody);
-            expect(request.url).toEqual("/xblock");
+            expect(request.url).toEqual("/xblock/");
            expect(request.method).toEqual("POST");
            expect(actualJson).toEqual(expectedJson);
        };