clean unsolved merge in explorer.html

templates/graphExplorer/explorer.html

@@ -85,16 +85,10 @@
 
               <ul class="nav pull-right">
                   <li class="dropdown">
-<<<<<<< HEAD
                       <a href="#" role="button" class="dropdown-toggle navbar-text" data-toggle="dropdown" title="That is your username">
                           <i class="icon-user"></i>
                           <span class="glyphicon glyphicon-user" aria-hidden="true" style="color:white"></span>
                           {{ user.username | truncatechars:15}}
-=======
-                      <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="That is your login"><i class="icon-user"></i>
-                            <span class="glyphicon glyphicon-user" aria-hidden="true" style="color:white"></span>
-                            {{ user.username | truncatechars:15}}
->>>>>>> refactoring
                           <i class="caret"></i>
                       </a>
                       <ul class="dropdown-menu">