CP-415-OSDOCS-11585-3: backport unused content removal

Author: ShaunaDiaz

microshift_support/microshift-etcd.adoc

@@ -6,12 +6,7 @@ include::_attributes/attributes-microshift.adoc[]
 
 toc::[]
 
-<<<<<<< HEAD
-[role="_abstract"]
-The etcd service is delivered as part of the {product-title} RPM. The etcd service is run as a separate process and the etcd lifecycle is managed automatically by {microshift-short}.
-=======
 The {product-title} RPM includes the etcd service. The etcd service runs as a separate process. {microshift-short} automatically manages the etcd lifecycle.
->>>>>>> 80b959dde2 (OSDOCS-11585-3: removes unused content MicroShift 4.14-4.16)
 
 include::modules/microshift-observe-debug-etcd-server.adoc[leveloffset=+1]