resolve conflict

wp-content/themes/cosmopet/functions.php

@@ -425,10 +425,7 @@ require_once('modules/blog/module-ajax-controller.php');
 require_once('modules/forms/module-ajax-controller.php');
 require_once('modules/shop/module-ajax-controller.php');
 
-<<<<<<< HEAD
 
-=======
->>>>>>> origin/master
 add_action('wp', 'my_custom_checkout_code');
 function my_custom_checkout_code() {
     if (function_exists('is_checkout') && is_checkout() && !is_order_received_page()) {
@@ -436,12 +433,8 @@ function my_custom_checkout_code() {
     }
 }
 
-<<<<<<< HEAD
-=======
 require_once('modules/author/module-ajax-controller.php');
 
->>>>>>> origin/master
-
 include_module('forms');
 include_module('layout');
 
@@ -624,8 +617,6 @@ register_sidebar( array(
 
 add_filter( 'woocommerce_price_trim_zeros', '__return_true' );
 
-<<<<<<< HEAD
-=======
 function add_comment_like() {
     global $wpdb;
     $table_name = $wpdb->prefix . 'cosmopet_likes';
@@ -964,4 +955,3 @@ function remove_view_cart_button_js() {
     <?php
 }
 
->>>>>>> origin/master

wp-content/themes/cosmopet/modules/shop/module-controller.php

@@ -321,7 +321,7 @@ function auto_fill_shipping_fields_from_billing( $order_id ) {
     // Сохраняем изменения в заказе
     $order->save();
 }
-=======
+
     add_filter('timber/context', function($context) {
         if (function_exists('is_product') && is_product()) {
             $product_id = get_the_ID();