From 1a778714ea4775d8fe8bf8ff8c7ef56da1185f7c Mon Sep 17 00:00:00 2001
From: Ares <ares@noreply.localhost>
Date: Wed, 28 Jun 2023 14:01:08 +0000
Subject: [PATCH] Update ReadME.MD

---
 ReadME.MD | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/ReadME.MD b/ReadME.MD
index 548c021..4486f9e 100644
--- a/ReadME.MD
+++ b/ReadME.MD
@@ -90,31 +90,3 @@ done
 
 需要手动做 Fix
 
-```Bash
-<<<<<<< HEAD
-https://raw.githubusercontent.com/charmed-kubernetes/bundle/main/releases/1.22/bundle.yaml
-charm pull cs:~containers/containerd-178
-charm pull cs:~containers/easyrsa-420
-charm pull cs:~containers/etcd-634
-charm pull cs:~containers/kubernetes-master-1078
-charm pull cs:~containers/kubernetes-worker-816
-charm pull cs:~containers/calico-838
-charm pull cs:~containers/kubeapi-load-balancer-844
-```
-=======
-charm pull cs:~containers/etcd-633
-charm pull cs:~containers/easyrsa-419
-charm pull cs:~containers/kubernetes-master-1077
-charm pull cs:~containers/kubernetes-worker-815
-charm pull cs:~containers/calico-838
-charm pull cs:~containers/containerd-177
-charm pull cs:~containers/kata-138
-# Extend
-charm pull cs:~containers/kubeapi-load-balancer-843
-charm pull cs:~containers/keepalived-110
-charm pull cs:~containers/coredns-20
-# Other
-charm pull cs:~containers/ubuntu-20
-charm pull cs:~containers/nrpe-75
-```
->>>>>>> 0ba2a75b267453d9584def41868de085d111994f