diff --git a/app/views/book.phtml b/app/views/book.phtml index 8c6c971..b70b049 100644 --- a/app/views/book.phtml +++ b/app/views/book.phtml @@ -1,6 +1,6 @@
- <?=$book['pricename']?> + <?=$book['pricename']?>
diff --git a/app/views/books.phtml b/app/views/books.phtml index dc43176..4ec222a 100644 --- a/app/views/books.phtml +++ b/app/views/books.phtml @@ -13,8 +13,13 @@ +<<<<<<< HEAD <?=$book['pricename']?> +======= + <?=$book['pricename']?> + +>>>>>>> 8dd13d8250d15e24fd459aaddeff17f981a745d6 0):?>