Merge pull request #49 from AckeeCZ/feat/prettier-tslint-conflicts

✨ Remove tslint and prettier conflicts

Author: vlasy

package.json

@@ -67,6 +67,7 @@
     "ts-jest": "^26.1.0",
     "tslint": "^6.0.0",
     "tslint-config-ackee": "^0.3.0",
+    "tslint-config-prettier": "^1.18.0",
     "typescript": "^3.5.3"
   },
   "husky": {

tslint.json

@@ -1,7 +1,8 @@
 {
     "defaultSeverity": "error",
     "extends": [
-        "tslint-config-ackee"
+        "tslint-config-ackee",
+        "tslint-config-prettier"
     ],
     "jsRules": {},
     "rules": {},