Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Notification
Commits
b0f79e2b
Commit
b0f79e2b
authored
Oct 06, 2021
by
Sanjeev-SLB
Browse files
Rebase
parent
f1fd1c9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
NOTICE
View file @
b0f79e2b
...
...
@@ -302,10 +302,7 @@ The following software have components provided under the terms of this license:
- nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
- okhttp (from https://github.com/square/okhttp)
- okhttp (from https://github.com/square/okhttp)
<<<<<<< HEAD
=======
- okhttp-logging-interceptor (from https://square.github.io/okhttp/)
>>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
- okhttp-urlconnection (from https://github.com/square/okhttp)
- okhttp-urlconnection (from https://github.com/square/okhttp)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
...
...
@@ -328,16 +325,9 @@ The following software have components provided under the terms of this license:
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
<<<<<<< HEAD
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
=======
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
>>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment