Task 7775 | изменил robots.txt добавил в гÐgitignore

.gitignore

@@ -3,7 +3,7 @@
 
 # GP | SEO
 sitemap*.xml
-!robots.txt
+robots.txt
 yandex_*.html
 google_*.html
 yandex_turbo.xml

robots.txt

@@ -15,12 +15,7 @@ Disallow: */embed
 Disallow: */wlwmanifest.xml
 Disallow: /xmlrpc.php
 Allow: */uploads
-<<<<<<< HEAD
 Sitemap: https://cosmopet.ru/sitemap_index.xml
-=======
-Sitemap: https://cosmopet.ae/sitemap_index.xml
->>>>>>> 2323f31 (Fix | bug fix)
-
 User-agent: GoogleBot
 Disallow: /cgi-bin
 Disallow: /?
@@ -51,12 +46,7 @@ Allow: /wp-*.jpg
 Allow: /wp-*.jpeg
 Allow: /wp-*.gif
 Allow: /wp-admin/admin-ajax.php
-<<<<<<< HEAD
 Sitemap: https://cosmopet.ru/sitemap_index.xml
-=======
-Sitemap: https://cosmopet.ae/sitemap_index.xml
->>>>>>> 2323f31 (Fix | bug fix)
-
 User-agent: Yandex
 Disallow: /cgi-bin
 Disallow: /?
@@ -81,11 +71,7 @@ Allow: /wp-*.jpg
 Allow: /wp-*.jpeg
 Allow: /wp-*.gif
 Allow: /wp-admin/admin-ajax.php
-<<<<<<< HEAD
 Sitemap: https://cosmopet.ru/sitemap_index.xml
-=======
-Sitemap: https://cosmopet.ae/sitemap_index.xml
->>>>>>> 2323f31 (Fix | bug fix)
 
 Clean-Param: utm_source&utm_medium&utm_campaign&etext&add-to-cart&per_page&per_row&from&attribute_pa_weight&attribute_pa_ves-upakovki
 Clean-Param: openstat