From 5f2376591bebdb4da22e00c44d5217004f59c172 Mon Sep 17 00:00:00 2001
From: Bonsai8863 <131906254+Bonsai8863@users.noreply.github.com>
Date: Fri, 17 May 2024 13:04:07 -0400
Subject: [PATCH] [frontend] Addressed merge conflicts

---
 .../StixCoreRelationshipCreationFromEntity.tsx       | 12 ++++++------
 .../StixDomainObjectAttackPatternsKillChain.tsx      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/StixCoreRelationshipCreationFromEntity.tsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/StixCoreRelationshipCreationFromEntity.tsx
index 610a2f10979bb..88bb35f7e5800 100644
--- a/opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/StixCoreRelationshipCreationFromEntity.tsx
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_relationships/StixCoreRelationshipCreationFromEntity.tsx
@@ -712,12 +712,12 @@ const StixCoreRelationshipCreationFromEntity: FunctionComponent<StixCoreRelation
             || allowedRelationshipTypes.length === 0
             || allowedRelationshipTypes.includes('stix-core-relationship')
             || allowedRelationshipTypes.includes(n),
-              resolveRelationsTypes(
-                fromEntities[0].entity_type,
-                toEntities[0].entity_type,
-                schema?.schemaRelationsTypesMapping ?? new Map(),
-              ),
-            ));
+            resolveRelationsTypes(
+              fromEntities[0].entity_type,
+              toEntities[0].entity_type,
+              schema?.schemaRelationsTypesMapping ?? new Map(),
+            ),
+          ));
           return (
             <>
               <div className={classes.header}>
diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.tsx b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.tsx
index 3a1bd0e45436d..ee1239d983b9d 100644
--- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.tsx
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.tsx
@@ -18,7 +18,6 @@ import StixDomainObjectAttackPatternsKillChainLines from './StixDomainObjectAtta
 import StixDomainObjectAttackPatternsKillChainMatrix from './StixDomainObjectAttackPatternsKillChainMatrix';
 import Filters from '../lists/Filters';
 import {
-  StixDomainObjectAttackPatternsKillChainStixCoreRelationshipsQuery$data,
   StixDomainObjectAttackPatternsKillChainStixCoreRelationshipsQuery$variables,
   StixDomainObjectAttackPatternsKillChainStixCoreRelationshipsQuery as TriggerQuery,
 } from './__generated__/StixDomainObjectAttackPatternsKillChainStixCoreRelationshipsQuery.graphql';
@@ -27,6 +26,7 @@ import {
   StixDomainObjectAttackPatternsKillChain_triggers$data,
 } from './__generated__/StixDomainObjectAttackPatternsKillChain_triggers.graphql';
 import { CreateRelationshipContext } from '../menus/CreateRelationshipContextProvider';
+import StixCoreObjectsExports from '../stix_core_objects/StixCoreObjectsExports';
 
 const StyledParameters = styled('div')({
   marginBottom: 20,
@@ -506,7 +506,7 @@ export const stixDomainObjectAttackPatternsKillChainStixCoreRelationshipsTrigger
 `;
 
 interface StixDomainObjectAttackPatternsKillChainProps {
-  triggerData: StixDomainObjectAttackPatternsKillChainStixCoreRelationshipsQuery$data,
+  triggerData: FragmentKey,
   componentProps: StixDomainObjectAttackPatternsKillChainComponentProps,
 }