resolve the conflicts
No related branches found
No related tags found
Checking pipeline status
Showing
- examples/osdu/README.md 4 additions, 4 deletionsexamples/osdu/README.md
- examples/osdu_baremetal_minikube/README.md 0 additions, 2 deletionsexamples/osdu_baremetal_minikube/README.md
- examples/osdu_baremetal_minikube/custom-values.yaml 4 additions, 0 deletionsexamples/osdu_baremetal_minikube/custom-values.yaml
- examples/osdu_offline_with_google_access/README.md 1 addition, 1 deletionexamples/osdu_offline_with_google_access/README.md
- examples/simple_osdu/README.md 29 additions, 14 deletionsexamples/simple_osdu/README.md
- examples/simple_osdu/variables.tf 1 addition, 1 deletionexamples/simple_osdu/variables.tf
- helm/osdu-gc-baremetal/values.yaml 0 additions, 1 deletionhelm/osdu-gc-baremetal/values.yaml
- modules/osdu/files/templates/values.tpl 0 additions, 1 deletionmodules/osdu/files/templates/values.tpl
- modules/osdu/wi-legal.tf 2 additions, 1 deletionmodules/osdu/wi-legal.tf
- tools/multipartition/README.md 2 additions, 0 deletionstools/multipartition/README.md
- tools/multipartition/add-partition.sh 2 additions, 2 deletionstools/multipartition/add-partition.sh
Loading
Please register or sign in to comment