Commit 562b6298 authored by 2breakegg's avatar 2breakegg

Merge remote-tracking branch 'origin/dev' into dev

parents 893b0bb6 472d80ed
...@@ -32,3 +32,4 @@ messages.xlf ...@@ -32,3 +32,4 @@ messages.xlf
messages.xlf.bak messages.xlf.bak
locale/*.xlf.bak locale/*.xlf.bak
/.vscode/ /.vscode/
/main.js
vs<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const platform_browser_dynamic_1 = require("@angular/platform-browser-dynamic");
const app_module_1 = require("./app/app.module");
platform_browser_dynamic_1.platformBrowserDynamic().bootstrapModule(app_module_1.AppModule);
//# sourceMappingURL=main.js.map
\ No newline at end of file
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module'; import { AppModule } from 'app/app.module';
platformBrowserDynamic().bootstrapModule(AppModule); platformBrowserDynamic().bootstrapModule(AppModule);
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"noImplicitAny": false, "noImplicitAny": false,
"suppressImplicitAnyIndexErrors": true, "suppressImplicitAnyIndexErrors": true,
"strictNullChecks": true, "strictNullChecks": true,
"skipLibCheck": true "skipLibCheck": true,
"baseUrl": "."
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment