-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
shengwei zhang
committed
Jan 20, 2023
1 parent
f8afc0b
commit 2695eff
Showing
2 changed files
with
0 additions
and
14 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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", | ||
|
|
||