fix: resolved conflict

contentstack · Mar 28, 2023 · 4e248c1 · 4e248c1
2 parents d0761f3 + 9f2a0bc
commit 4e248c1
Show file tree

Hide file tree

Showing 4 changed files with 326 additions and 272 deletions.
diff --git a/tslint.json → .eslintrc b/tslint.json → .eslintrc