Fixed merge conflict

2026-05-26 16:34:46 +00:00 · 2018-05-05 12:19:14 +05:30
parent 88aa3ec275 fcb984b294
commit abd0325acd
19 changed files with 175 additions and 34 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ before_script:
  - bench reinstall --yes
  - bench build
  - bench scheduler disable
+  - sed -i 's/9000/9001/g' sites/common_site_config.json
  - bench start &
  - sleep 10