equinor
diff --git a/‎react/package-lock.json‎
Lines changed: 0 additions & 10 deletions b/‎react/package-lock.json‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎react/package.json‎
Lines changed: 0 additions & 4 deletions b/‎react/package.json‎
Lines changed: 0 additions & 4 deletions
@@ -52,11 +52,7 @@
     "author": "Equinor <[email protected]>",
     "license": "MPL",
     "dependencies": {
-<<<<<<< HEAD
-        "@emerson-eps/color-tables": "^0.4.43",
-=======
         "@emerson-eps/color-tables": "^0.4.44",
->>>>>>> 583da83 (using view and latested color legend still got issue)
         "@equinor/eds-core-react": "^0.12.1",
         "@equinor/eds-icons": "^0.9.1",
         "@equinor/videx-wellog": "^0.7.0",