resolving merge conflict

2021-01-27 09:42:25 -08:00
parent 4f38a2d8b1 1172adefb4
commit 6f47cc50b0
9 changed files with 27 additions and 14 deletions
@@ -67,8 +67,8 @@
    "@babel/core": "^7.12.10",
    "@babel/preset-env": "^7.12.11",
    "@babel/preset-react": "^7.12.10",
-    "@formatjs/cli": "^3.0.1",
    "babel-loader": "^8.2.2",
+    "babel-plugin-formatjs": "^9.0.2",
    "browserslist": "^4.16.1",
    "copy-webpack-plugin": "^6.4.1",
    "cssnano": "^4.1.10",