fix merge conflict

2015-12-19 10:54:44 -05:00
parent ff4c684e54
commit c504f5005d
11 changed files with 151 additions and 22 deletions
@@ -1759,6 +1759,11 @@ var AppInfo = {};
            require(['themes/halloween/theme']);
            return;
        }
+
+        if (month == 11 && day >= 18 && day <= 26) {
+            //require(['themes/holiday/theme']);
+            return;
+        }
    }

    function initRequire() {