Update retail.cfg

uyuni-project · Jan 16, 2024 · 779436e · 779436e
1 parent 9c4b1f2
commit 779436e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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