# Conflicts: # src/core/manager.ts
Feature/190417 data center See merge request !1
Merge branch 'feature/190417-data-center' of gitlab2.dui88.com:laoqifeng/scilla-core into feature/190417-data-center