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/pages.js
+++ b/customize.dist/pages.js
@@ -285,6 +285,10 @@ define([
        return h('div#container');
    };

+    Pages['/profile/'] = Pages['/profile/index.html'] = function () {
+        return h('div#container');
+    };
+
    Pages['/register/'] = Pages['/register/index.html'] = function () {
        return [h('div#main', [
            h('div.mainOverlay'),