Commit a0b5bc0512947faca8c587a8ae2ed65a5106f790
1 parent
11769061
Exists in
master
and in
39 other branches
Missing from merge
Showing
1 changed file
with
1 additions
and
8 deletions
Show diff stats
src/colab/deprecated/templates/base.html
| @@ -50,17 +50,10 @@ | @@ -50,17 +50,10 @@ | ||
| 50 | {% browserid_login text='Login' next=request.path %} | 50 | {% browserid_login text='Login' next=request.path %} |
| 51 | </div> | 51 | </div> |
| 52 | {% else %} | 52 | {% else %} |
| 53 | -<<<<<<< HEAD | ||
| 54 | <div class="col-sm-1 text-right"> | 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 | </div> | 55 | </div> |
| 57 | <div class="col-sm-1 text-center"> | 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 | <a href="{% url 'user_profile' user.username %}"> | 57 | <a href="{% url 'user_profile' user.username %}"> |
| 65 | {% trans "My Profile" %} | 58 | {% trans "My Profile" %} |
| 66 | </a> | 59 | </a> |