resolve merge conflicts in template.js

2017-06-27 14:28:28 +02:00
parent 9b6790534f b2003b32c9
commit 3a9b480e4e
2 changed files with 6 additions and 1 deletions
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -136,6 +136,8 @@ $(function () {

        if (/^\/settings\//.test(pathname)) {
            require([ '/settings/main.js', ], function () {});
+        } else if (/^\/profile\//.test(pathname)) {
+            require([ '/profile/main.js'], function () {});
        } else if (/^\/user\//.test(pathname)) {
            require([ '/user/main.js'], function () {});
        } else if (/^\/register\//.test(pathname)) {
@@ -149,6 +151,5 @@ $(function () {
            require([ '/customize/main.js', ], function () {});
        }
    });
-
 });
 });