From ab712dfb553d809149b2d72fff0fe591f7b325b5 Mon Sep 17 00:00:00 2001 From: Zhuk Viatcheslav Date: Thu, 30 Apr 2020 15:27:16 +0300 Subject: [PATCH] s --- app/views/layout.phtml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/views/layout.phtml b/app/views/layout.phtml index b872f4b..bb8283e 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -2,13 +2,8 @@ Еженедельник Аргументы Недели - <?=$title?> -<<<<<<< HEAD - - -======= ->>>>>>> fc16e31bc487b551c5611edcb405aca735ce6f38