fix merge conflicts

RocketChat · Oct 23, 2023 · db7f775 · db7f775
1 parent 387fd8f
commit db7f775
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/package.json b/package.json
@@ -19,18 +19,9 @@
 	"devDependencies": {
 		"@changesets/cli": "^2.26.1",
 		"@types/chart.js": "^2.9.37",
-		"@types/eslint": "^8",
 		"@types/js-yaml": "^4.0.5",
-		"@typescript-eslint/parser": "^5.0.1",
-		"eslint": "^8.7.0",
 		"husky": "^7.0.4",
-<<<<<<< HEAD
-		"prettier": "^2.5.1",
-		"turbo": "^1.10.13",
-		"typescript": "^4.4.4"
-=======
-		"turbo": "~1.10.14"
->>>>>>> origin/develop
+		"turbo": "~1.10.15"
 	},
 	"workspaces": [
 		"apps/*",