fixed conflicts

This commit is contained in:
Ashwin 2018-04-12 13:18:02 +05:30
commit d10b64a2b5
2 changed files with 5 additions and 5 deletions

View file

@ -20,6 +20,11 @@ Django CRM is opensourse CRM developed on django framework. It has all the basic
.. image:: https://www.codetriage.com/micropyramid/django-crm/badges/users.svg
:target: https://www.codetriage.com/micropyramid/django-crm
.. image:: https://api.codacy.com/project/badge/Grade/b11da5f09dd542479fd3bd53944595d2
:alt: Codacy Badge
:target: https://app.codacy.com/app/ashwin/Django-CRM?utm_source=github.com&utm_medium=referral&utm_content=MicroPyramid/Django-CRM&utm_campaign=badger
http://django-crm.readthedocs.io for latest documentation

View file

@ -18,7 +18,6 @@
</ul>
<ul class="navbar-nav navbar-right my-2 my-lg-0">
<li class="nav-item dropdown">
{% with request.profile as profile %}
<a href="#" class="dropdown-toggle abcd nav-link" data-toggle="dropdown" role="button" aria-haspopup="true"
@ -36,10 +35,6 @@
<a class="dropdown-item" href="{% url 'common:logout' %}"><i class="fas fa-sign-out-alt"></i> Logout</a>
</div>
</li>
</ul>
</div>
</nav>