Skip to content

Commit

Permalink
resolve the test merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
  • Loading branch information
yujin-emma committed Feb 5, 2024
1 parent 93cb185 commit f3875a1
Showing 1 changed file with 1 addition and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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',
});
Expand Down

0 comments on commit f3875a1

Please sign in to comment.