Remove all files to resolve conflicts

UKCloud · Jan 23, 2020 · 406b9ff · 406b9ff
1 parent af9ad09
commit 406b9ff
Show file tree

Hide file tree

Showing 55 changed files with 0 additions and 1,846 deletions.
diff --git a/README.md b/README.md
diff --git a/containers/openshift-installer/Dockerfile b/containers/openshift-installer/Dockerfile
diff --git a/containers/stage1/Dockerfile b/containers/stage1/Dockerfile
diff --git a/containers/stage2/Dockerfile b/containers/stage2/Dockerfile
diff --git a/containers/stage2/README.md b/containers/stage2/README.md
diff --git a/upi/vsphere/stage1/1.setup-env/Dockerfile b/upi/vsphere/stage1/1.setup-env/Dockerfile
diff --git a/upi/vsphere/stage1/1.setup-env/dhcp-config.tmpl b/upi/vsphere/stage1/1.setup-env/dhcp-config.tmpl
diff --git a/upi/vsphere/stage1/1.setup-env/setup-env.ps1 b/upi/vsphere/stage1/1.setup-env/setup-env.ps1
diff --git a/upi/vsphere/stage1/2.create-bastion/Dockerfile b/upi/vsphere/stage1/2.create-bastion/Dockerfile
diff --git a/upi/vsphere/stage1/2.create-bastion/bastion-ignition.tmpl b/upi/vsphere/stage1/2.create-bastion/bastion-ignition.tmpl