Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
lucas-barros committed Apr 25, 2024
1 parent 03b9c29 commit 6dff87d
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions packages/core/src/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@
"rootDir": "./",
"baseUrl": "../src",
"paths": {
"@src/*": ["*"],
"@ui/*": ["ui/*"]
"@src/*": [
"*"
],
"@ui/*": [
"ui/*"
]
},
"declarationDir": "./",
"declaration": true,
Expand All @@ -26,6 +30,12 @@
"path": "../../common/src"
}
],
"exclude": ["dist/"],
"include": ["**/*.ts", "**/*.tsx", "**/*.json"]
"exclude": [
"dist/"
],
"include": [
"**/*.ts",
"**/*.tsx",
"**/*.json"
]
}

0 comments on commit 6dff87d

Please sign in to comment.