main/templates/main/product/detail.html

@@ -94,11 +94,7 @@
                 <div class="col-md-6">
                     <div class="product-details">
                         <h1 class="product-name" style="color: #ffffff;">{{ product.name }}</h1>
-<<<<<<< HEAD
-                        <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">{{ product.price }}₸</p>
-=======
                         <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">₸{{ product.price }}</p>
->>>>>>> 28b575b35ad3c9232ec053f2e1a0421dfcd41952
                         <p class="description">{{ product.description|linebreaks }}</p>
                         <a href="{% url 'index' %}" class="btn btn-primary">Вернуться на главную</a>