From 779436ead6d12cecb9989725c3096c8356a99d6f Mon Sep 17 00:00:00 2001
From: Joseph Cayouette <jcayouette@suse.com>
Date: Tue, 16 Jan 2024 14:34:52 +0100
Subject: [PATCH] Update retail.cfg

---
 l10n-weblate/retail.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/l10n-weblate/retail.cfg b/l10n-weblate/retail.cfg
index 8b1d1f8caa8..d6de77f0560 100644
--- a/l10n-weblate/retail.cfg
+++ b/l10n-weblate/retail.cfg
@@ -5,9 +5,6 @@
 
 [options] opt:"--porefs=counter"
 
-<<<<<<< HEAD
-=======
->>>>>>> 3a11501f3f (Salt formula dir #23009 (#2633))
 [type: asciidoc] modules/retail/_attributes.adoc $lang:translations/$lang/modules/retail/_attributes.adoc
 [type: asciidoc] modules/retail/nav-retail-guide.adoc $lang:translations/$lang/modules/retail/nav-retail-guide.adoc
 [type: asciidoc] modules/retail/pages/containerized-saltboot.adoc $lang:translations/$lang/modules/retail/pages/containerized-saltboot.adoc