fix merge conflicts

[github/Chocobozzz/PeerTube.git] / client / tsconfig.json

diff --git a/client/tsconfig.json b/client/tsconfig.json
index ca58ddb899554265d570abf670136914b2a79421..64266d49db000733104030b2f1a4904b8b023638 100644 (file)
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,18 +1,14 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "compilerOptions": {
-    "target": "es5",
-    "module": "system",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "removeComments": false,
-    "noImplicitAny": false
-  },
-  "exclude": [
-    "node_modules",
-    "typings/main",
-    "typings/main.d.ts"
-  ],
-  "compileOnSave": false
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    }
+  ]
 }