From b3506544e56da2446dd5b8ef4f780a0c65b4615e Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Thu, 27 Nov 2014 23:45:19 +0300
Subject: [PATCH] conflict :|
---
~dev_rating/application/views/base.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig
index 3006fedd3..f39b3f739 100644
--- a/~dev_rating/application/views/base.twig
+++ b/~dev_rating/application/views/base.twig
@@ -57,7 +57,7 @@
</div>
<div class="top_name_faculty">{{ User.FacultyName }}</div>
<div class="top_user">
- <div id = "top_user_messages" alt="Мои сообщения">
+{# <div id = "top_user_messages" alt="Мои сообщения"> #}
{{ HTML.image('media/img/messageIcon.png', {'height': '11px'})|raw }}
<!-- <div class="top_user_messages_icon"><img src="~dev_rating/~dev_rating/media/img/addList.png"></div> -->
(<div class="messages_number">1</div>)
--
GitLab