Merge with ux-member

Author: dmytakis

src/app/app.module.ts

@@ -128,7 +128,7 @@ import {
 	IContentService,
 	IEnvironmentService,
 	IStepperService,
-	// IStaticContentService,
+	IStaticContentService,
 } from 'sng-core';
 
 import { StaticDataService } from './core/helpers/static-data.service';
@@ -249,7 +249,7 @@ import { StaticContentService } from './core/services/static_content.service';
 		{ provide: ILoyaltyService, useClass: LoyaltyService },
 		{ provide: IMicrocreditService, useClass: MicrocreditService },
 		{ provide: IStepperService, useClass: StepperService },
-		// { provide: IStaticContentService, useClass: StaticContentService },
+		{ provide: IStaticContentService, useClass: StaticContentService },
 		{ provide: IEnvironmentService, useValue: environment },
 		/*{
 			provide: SWIPER_CONFIG,

src/app/partner-menu/partner-events/edit-event/edit-event.component.html

@@ -186,14 +186,9 @@ <h4 class="modal-title">{{'EVENT.DELETE' | translate}}</h4>
     {{'EVENT.DELETE_CONFIRM' | translate}} '{{title}}'?
   </div>
   <div class="modal-footer">
-    <<<<<<< HEAD <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">
-      {{'EVENT.DELETE'
+    <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">{{'EVENT.DELETE'
       | translate}}</button>
-      =======
-      <button mat-raised-button class="btn btn-secondary mr-3"
-        (click)="deleteItem();c('Close click'); ">{{'EVENT.DELETE' | translate}}</button>
-      >>>>>>> ux
-      <button mat-raised-button class="btn" (click)="c('Close click');">{{'EVENT.CANCEL' | translate}}</button>
+    <button mat-raised-button class="btn" (click)="c('Close click');">{{'EVENT.CANCEL' | translate}}</button>
   </div>
 </ng-template>
 <!--end::Confirmation Modal (Remove Item)-->

src/app/partner-menu/partner-explore/partner-explore.component.html

@@ -1,5 +1,4 @@
 <div class="explore">
-<<<<<<< HEAD
   <p class="section-description">{{'PARTNER.EXPLORE.DESCRIPTION' | translate }}</p>
 
   <!--begin::Internal Posts/Events List(Carousel)-->
@@ -10,8 +9,6 @@
   <hr>
   <br>
 
-=======
->>>>>>> ux-member
   <!--begin::Partners List(Carousel)-->
   <sng-partners-list-carousel>
   </sng-partners-list-carousel>

src/app/partner-menu/partner-posts/edit-post/edit-post.component.html

@@ -131,14 +131,9 @@ <h4 class="modal-title">{{ 'POST.DELETE' | translate }}</h4>
     {{ 'POST.DELETE_CONFIRM' | translate }} '{{title}}'?
   </div>
   <div class="modal-footer">
-    <<<<<<< HEAD <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">{{
-      'POST.DELETE'
-      | translate }}</button>
-      =======
-      <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">{{
-        'POST.DELETE' | translate }}</button>
-      >>>>>>> ux
-      <button mat-raised-button class="btn" (click)="c('Close click');">{{ 'POST.CANCEL' | translate }}</button>
+    <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">{{
+      'POST.DELETE' | translate }}</button>
+    <button mat-raised-button class="btn" (click)="c('Close click');">{{ 'POST.CANCEL' | translate }}</button>
   </div>
 </ng-template>
 <!--end::Confirmation Modal (Remove Item)-->