From 8eaba5af364d1a71e41ac7e7ee84656463a95061 Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:48:49 +0000
Subject: [PATCH] fixed merge conflict

Signed-off-by: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
---
 .../author-apps/kubernetes/howto-yaml-base-support/index.md     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/guides/author-apps/kubernetes/howto-yaml-base-support/index.md b/docs/content/guides/author-apps/kubernetes/howto-yaml-base-support/index.md
index 4076775b3..7e9c5381e 100644
--- a/docs/content/guides/author-apps/kubernetes/howto-yaml-base-support/index.md
+++ b/docs/content/guides/author-apps/kubernetes/howto-yaml-base-support/index.md
@@ -8,7 +8,7 @@ categories: "How-To"
 tags: ["containers","Kubernetes"]
 ---
 
-This guide will provide an overview of how to migrate your existing Kubernetes resources from [Kubernetes YAML](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#writing-a-deployment-spec).
+This guide will provide an overview of how to migrate your existing Kubernetes resources from [Kubernetes YAML](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#writing-a-deployment-spec). 
 
 ### Prerequisites