solved merge issues

This commit is contained in:
lotte
2020-06-26 14:27:28 +02:00
parent 6ad7cee7d1
commit 9677e053f5
3 changed files with 5 additions and 2 deletions

View File

@@ -50,3 +50,5 @@ if (hasValue(environment.universal) && environment.universal.preboot === false)
} else {
document.addEventListener('DOMContentLoaded', () => bootloader(main));
}
import 'zone.js/dist/zone';