Commit c4725ba8 authored by davidzagi93@gmail.com's avatar davidzagi93@gmail.com

resolve conflict by removing tsconfig.base.json in nx.json file

parent 053bd393
......@@ -6,7 +6,7 @@
"dependencies": "*",
"devDependencies": "*"
},
"tsconfig.base.json": "*",
"tsconfig.json": "*",
"tslint.json": "*",
".eslintrc": "*",
"nx.json": "*"
......
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