Fix merge conflicts
This commit is contained in:
+2
-2
@@ -42,10 +42,10 @@
|
||||
<span class="material-icons filter_list"></span>
|
||||
</button>
|
||||
<button is="emby-button" class="btnViewSettings button-flat listTextButton-autohide">
|
||||
<span class="material-icons more_horiz"></span>
|
||||
<span class="material-icons more_vert"></span>
|
||||
</button>
|
||||
<button is="paper-icon-button-light" class="btnViewSettings listIconButton-autohide">
|
||||
<span class="material-icons more_horiz"></span>
|
||||
<span class="material-icons more_vert"></span>
|
||||
</button>
|
||||
</div>
|
||||
<div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered" style="padding: 0 0 10vh 0;">
|
||||
|
||||
Reference in New Issue
Block a user