fix: conflicts

This commit is contained in:
pateljannat
2021-04-22 14:43:53 +05:30
6 changed files with 387 additions and 256 deletions

View File

@@ -18,6 +18,7 @@ app_include_css = "/assets/community/css/community.css"
app_include_js = "/assets/community/js/community.js"
# include js, css files in header of web template
web_include_css = "/assets/css/community.css"
# web_include_css = "/assets/community/css/community.css"
# web_include_js = "/assets/community/js/community.js"