fix: conflicts

cognitedata · Jun 23, 2023 · 8c2cba7 · 8c2cba7
1 parent 1e69fe0
commit 8c2cba7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/react-components/package.json b/react-components/package.json
@@ -60,4 +60,4 @@
     "lodash": "^4.17.21",
     "style-loader": "^3.3.3"
   }
-}
+}
diff --git a/react-components/yarn.lock b/react-components/yarn.lock