Fix merge conflicts

2020-05-16 18:07:32 +02:00
parent dd80697e61
commit 6a596bd497
10 changed files with 13 additions and 14 deletions
@@ -10,7 +10,7 @@
    <div class="guide-headerTimeslots">
        <div class="guide-channelTimeslotHeader">
            <button is="paper-icon-button-light" type="button" class="btnGuideViewSettings" title="${ButtonMore}">
-                <span class="material-icons btnGuideViewSettingsIcon more_horiz" aria-hidden="true"></span>
+                <span class="material-icons btnGuideViewSettingsIcon more_vert" aria-hidden="true"></span>
            </button>
        </div>
        <div class="timeslotHeaders scrollX guideScroller"></div>