diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
| commit | c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch) | |
| tree | a13c2d56c1b14ba99a853fb7494a9214d075554d /view/tpl/nav.tpl | |
| parent | 2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff) | |
| parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
| download | volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2 volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip | |
resolve merge conflict
Diffstat (limited to 'view/tpl/nav.tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index bd829d4d3..f74c88ce7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -147,16 +147,8 @@ <div id="nav-login" class="login-dropdown-menu" style="display:none; width:150%;"> {{$nav.login}} {{$nav.remote_login}} - - <!-- {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> - {{/foreach}} --> </div> </li> -<!-- {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> - {{/foreach}} ---> {{/if}} {{if $nav.register}} |