Fixe merge conflit

This commit is contained in:
Peter Maquiran
2021-01-19 08:52:43 +01:00
185 changed files with 6115 additions and 379 deletions
+3 -2
View File
@@ -31,7 +31,8 @@
<!-- <ion-tab-button tab="chat">
<ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button> -->
</ion-tab-bar>
</ion-tab-button>
-->
</ion-tab-bar>
</ion-tabs>