Skip to content

B
baas-ide
Commit c4725ba8 authored by davidzagi93@gmail.com's avatar davidzagi93@gmail.com
Browse files
Options

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

parent 053bd393
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
nx.json
View file @ c4725ba8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"dependencies": "*", "dependencies": "*",
"devDependencies": "*" "devDependencies": "*"
}, },
"tsconfig.base.json": "*", "tsconfig.json": "*",
"tslint.json": "*", "tslint.json": "*",
".eslintrc": "*", ".eslintrc": "*",
"nx.json": "*" "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