From 40df46c3b673204cf067556678f9da8d3e79f51f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 11 Jun 2021 12:49:15 +0300
Subject: [PATCH] s

---
 app/views/book.phtml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/views/book.phtml b/app/views/book.phtml
index fecf66f..4f401c1 100644
--- a/app/views/book.phtml
+++ b/app/views/book.phtml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <section id="row">
 <div id="book_id">
     <img style="width:100%;" src="<?=$book['pic']?>">
@@ -10,7 +9,7 @@
         <p class="price"><a href="<?=$book['links']['pdf']?>">Читать PDF</a></p>
             <!-- <p><a href="<?=$book['links']['text']?>">Читать текст</a></p> -->
             <?if ($book['category_id'] == 1):?>
-                <p><a href="<?=$book['links']['download']?>">Скачать PDF</a></p>
+                <p class="price"><a href="<?=$book['links']['download']?>">Скачать PDF</a></p>
             <?endif?>    
     <?else:?>
         <?$paylink = 'https://argumenti.ru/robomail/'.$book['price_id']?>
@@ -18,20 +17,4 @@
     <?endif?>  
 </div>
 </section>
-=======
-<div class="book_skeleton">
-        <div class="book_mini">
-                <img src="<?=$book['pic']?>">
-                <p class="book_mini_title"><?=$book['pricename']?></p>
-                <?if ($buy_status):?>
-                    <p><a href="<?=$book['links']['pdf']?>">Открыть PDF</a></p>
-                    <!-- <p><a href="<?=$book['links']['text']?>">Читать текст</a></p> -->
-                <?else:?>
-                     <?$paylink = 'https://argumenti.ru/robomail/'.$book['price_id']?>
-                     <p><?=$book['price']?> руб.</p>
-                     <p><a href="<?=$paylink?>">Купить</a></p>
-                <?endif?>  
-        </div>
-        <div><?=$book['priceanons']?></div>
-    </div>
->>>>>>> 76dc03e5a573e5b455e746185677a5a6c1bc6406
+