(DOCSP-38124): Fixed conflict.

Author: corryroot

source/ak8so-get-started.txt

@@ -43,11 +43,7 @@ manage resources in |service| for Government.
 Compatibility
 -------------
 
-<<<<<<< HEAD
 |ak8so| is compatible with specific versions of |k8s| and 
-=======
-|ak8so| is compatible with the specific versions of |k8s| and 
->>>>>>> cc09016 ((DOCSP-37795): Added body content to AKO drawer pages.)
 OpenShift. |k8s| nodes must be running processors with the x86-64, 
 AMD64, or ARM64 architecture.