Missing from merge

Sergio Oliveira
1 parent 11769061
Showing 1 changed file with 1 additions and 8 deletions Show diff stats
src/colab/deprecated/templates/base.html
@@ -50,17 +50,10 @@
           {% browserid_login text='Login' next=request.path %}
         </div>
         {% else %}
-<<<<<<< HEAD
         <div class="col-sm-1 text-right">
-          {% trans "authenticated as" %} <b>{{ user.email }}</b>
+          {% trans "authenticated as" %} <b>{{ user.username }}</b>
         </div>
         <div class="col-sm-1 text-center">
-=======
-        <span class="colborder">
-          {% trans "authenticated as" %} <b>{{ user.username }}</b>
-        </span>
-        <span class="colborder">
->>>>>>> master
           <a href="{% url 'user_profile' user.username %}">
             {% trans "My Profile" %}
           </a>
...	...	@@ -50,17 +50,10 @@
50	50	{% browserid_login text='Login' next=request.path %}
51	51	</div>
52	52	{% else %}
53		-<<<<<<< HEAD
54	53	<div class="col-sm-1 text-right">
55		- {% trans "authenticated as" %} <b>{{ user.email }}</b>
	54	+ {% trans "authenticated as" %} <b>{{ user.username }}</b>
56	55	</div>
57	56	<div class="col-sm-1 text-center">
58		-=======
59		- <span class="colborder">
60		- {% trans "authenticated as" %} <b>{{ user.username }}</b>
61		- </span>
62		- <span class="colborder">
63		->>>>>>> master
64	57	<a href="{% url 'user_profile' user.username %}">
65	58	{% trans "My Profile" %}
66	59	</a>
...	...