From 211462de62d116eb09b5e78fcc82fa1c698050c6 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 23 Aug 2022 11:48:09 +0300
Subject: [PATCH] s

---
 app/views/books.phtml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/views/books.phtml b/app/views/books.phtml
index 4ec222a..cc2702b 100644
--- a/app/views/books.phtml
+++ b/app/views/books.phtml
@@ -12,15 +12,8 @@
         <div class="book_mini">
         <?$link = SITE.'product/'.$book['priceslug']?>
             <a href="<?=$link?>" target="_blank">
-                <!--<img src="<?//=picbook($book, 180, 280)?>" alt="<?//=$book['pricename']?>">-->
-<<<<<<< HEAD
                 <img src="<?=picbook_orig($book)?>" alt="<?=$book['pricename']?>">
-                <!--<img src="https://argumenti.ru/pub/images/price/<?=$book['priceimg']?>" alt="<?=$book['pricename']?>">-->
-=======
-               <img src="<?=picbook_orig($book)?>" alt="<?=$book['pricename']?>">
-            <!-- <img src="https://argumenti.ru/pub/images/price/<?=$book['priceimg']?>" alt="<?=$book['pricename']?>"> -->
->>>>>>> 8dd13d8250d15e24fd459aaddeff17f981a745d6
-
+                <!-- <img src="https://argumenti.ru/pub/images/price/<?=$book['priceimg']?>" alt="<?=$book['pricename']?>"> -->
             </a>    
                 <?if ($book['priceauthor_id'] > 0):?>
                     <p class="book_mini_title">