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/utils/module.js
+++ b/cms/static/js/utils/module.js
@@ -11,16 +11,11 @@ define(["underscore"], function (_) {
    var urlRoot = '/xblock';

    var getUpdateUrl = function (locator) {
-<<<<<<< HEAD
-        if (locator === undefined) {
-            return urlRoot + "/";
-=======
        if (_.isUndefined(locator)) {
-            return urlRoot;
->>>>>>> edx/master
+            return urlRoot + '/';
        }
        else {
-            return urlRoot + "/" + locator;
+            return urlRoot + '/' + locator;
        }
    };
    return {
@@ -28,4 +23,3 @@ define(["underscore"], function (_) {
        getUpdateUrl: getUpdateUrl
    };
 });
-