Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucatescari
lucatescari committed Apr 19, 2018
2 parents d0a3fa5 + a7cce43 commit 6d42e4e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions default.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@
</li>
</ul>
<div class="ly-footer-imprint">
<<<<<<< HEAD
<dnn:login id="DnnLogin" cssclass="ly-login d-sm-none-down" runat="server" />
=======
<dnn:login id="DnnLogin" cssclass="ly-login d-sm" runat="server" />
>>>>>>> a7cce43e3711906f6791bd5f00032e1d9fc59185
<a href="<%= LocalizeString("Imprint.Url") %>" title="Impressum"><%= LocalizeString("Imprint.Text") %></a>
</div>
</div>
Expand Down

0 comments on commit 6d42e4e

Please sign in to comment.