fix: pipeline

frontend/app/src/app/modules/about/about-licenses.scss

@@ -1,10 +1,5 @@
-<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts
-/*
- * Copyright (C) 2020 StApps
-========
 /*!
  * Copyright (C) 2023 StApps
->>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -17,18 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-
-<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts
-export enum ThingType {
-  AggArray = 'agg array',
-  AggGlobal = 'agg global',
-  AggGlobalNested = 'agg global nested',
-  AggNested = 'agg nested',
-  AggInherited = 'agg inherited',
-  AggInheritedGlobal = 'agg inherited global',
-  AggInheritedOverwritten = 'agg inherited overwritten',
-}
-========
 ion-content > div {
   height: 100%;
 }
@@ -52,4 +35,3 @@ cdk-virtual-scroll-viewport {
   vertical-align: text-top;
   height: 14px;
 }
->>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss

frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss

@@ -12,35 +12,9 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-
-<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item.scss
-:host {
-  display: block;
-}
-
-ion-item::part(native) {
-  height: 100%;
-}
-
-.ion-text-wrap ::ng-deep ion-label {
-  white-space: normal !important;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-}
-
-ion-item {
-  --border-color: transparent;
-  @include border-radius-in-parallax(var(--border-radius-default));
-  overflow: hidden;
-  --inner-padding-end: 0;
-  --padding-start: var(--spacing-sm);
-  margin: var(--spacing-sm);
-========
 simple-swiper {
   --swiper-slide-width: 256px;
 }
->>>>>>>> app/develop:frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss
 
 .more-news {
   font-size: var(--font-size-xl);

frontend/app/src/app/modules/data/list/data-list.scss

@@ -12,9 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-<<<<<<<< HEAD:frontend/app/src/app/modules/settings/item/settings-item.scss
-========
-
 ion-list {
   background: none;
 }
@@ -22,4 +19,3 @@ ion-list {
 skeleton-list {
   height: 100%;
 }
->>>>>>>> app/develop:frontend/app/src/app/modules/data/list/data-list.scss

frontend/app/src/app/modules/settings/item/settings-item.scss

@@ -1,10 +1,5 @@
-<<<<<<<< HEAD:examples/minimal-plugin/src/common.ts
-/*
- * Copyright (C) 2019 StApps
-========
 /*!
  * Copyright (C) 2023 StApps
->>>>>>>> app/develop:frontend/app/src/app/modules/settings/item/settings-item.scss
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -17,8 +12,3 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-<<<<<<<< HEAD:examples/minimal-plugin/src/common.ts
-
-// TODO: place commonly used values here
-========
->>>>>>>> app/develop:frontend/app/src/app/modules/settings/item/settings-item.scss