[v4] Removes garbage from previous conflict

This commit is contained in:
Gustavo Maximiliano Cortez 2018-02-01 11:06:57 -03:00
parent 2506df8423
commit 0e888ac4fd
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
1 changed files with 2 additions and 2 deletions

View File

@ -121,7 +121,7 @@
</ion-note>
</button>
<ion-item-divider color="light" *ngIf="exchangeServices && exchangeServices.length > 0">
<ion-item-divider *ngIf="exchangeServices && exchangeServices.length > 0">
{{'Integrations' | translate}}
</ion-item-divider>
@ -132,7 +132,7 @@
<span>{{service.title || service.name}}</span>
</button>
<ion-item-divider color="light">More</ion-item-divider>
<ion-item-divider>More</ion-item-divider>
<button ion-item (click)="openAdvancedPage()">
<ion-icon name="ios-cog-outline" item-start></ion-icon>