From f3875a138d11cce1b4f5e0cfdf07a6eeb8e3b626 Mon Sep 17 00:00:00 2001
From: yujin-emma <yujin.emma.work@gmail.com>
Date: Mon, 5 Feb 2024 23:05:56 +0000
Subject: [PATCH] resolve the test merge conflict

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
---
 .../check_conflict_for_data_source.test.ts    | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts b/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
index 8958c3339473..c575f73f9154 100644
--- a/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
+++ b/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
@@ -3,40 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
-<<<<<<< HEAD
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
-=======
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Any modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 import { mockUuidv4 } from './__mocks__';
 import { SavedObjectReference, SavedObjectsImportRetry } from 'opensearch-dashboards/public';
 import { SavedObject } from '../types';
@@ -178,7 +144,7 @@ describe('#checkConflictsForDataSource', () => {
 
   it('can push error when do not override with data source conflict', async () => {
     const params = setupParams({
-      objects: [dsObj1],
+      objects: [dataSourceObj1],
       ignoreRegularConflicts: false,
       dataSourceId: 'currentDs',
     });