commit after resolve merge conflit

This commit is contained in:
Eudes Inácio
2023-03-10 09:05:33 +01:00
parent 05d8bf424e
commit 889e382905
14 changed files with 19 additions and 22 deletions
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-header class="ion-no-border header-2">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-header class="ion-no-border header-2">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-content class="container-wrapper">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border pb-20">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-content class="container-wrapper">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<div class="ion-page d-none" id="main-content">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-header class="ion-no-border header-2">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>
<ion-header class="ion-no-border header-2">
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
<!-- <app-header > </app-header> -->
</ion-header>