Merge conflict

1 files changed, 0 insertions, 49 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2020.promise.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2020.promise.d.ts
deleted file mode 100644
index 15b0f2c..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2020.promise.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed 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
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-
-
-/// <reference no-default-lib="true"/>

-
-
-interface PromiseFulfilledResult<T> {

-    status: "fulfilled";

-    value: T;

-}

-

-interface PromiseRejectedResult {

-    status: "rejected";

-    reason: any;

-}

-

-type PromiseSettledResult<T> = PromiseFulfilledResult<T> | PromiseRejectedResult;

-

-interface PromiseConstructor {

-    /**

-     * Creates a Promise that is resolved with an array of results when all

-     * of the provided Promises resolve or reject.

-     * @param values An array of Promises.

-     * @returns A new Promise.

-     */

-    allSettled<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: PromiseSettledResult<Awaited<T[P]>> }>;

-

-    /**

-     * Creates a Promise that is resolved with an array of results when all

-     * of the provided Promises resolve or reject.

-     * @param values An array of Promises.

-     * @returns A new Promise.

-     */

-    allSettled<T>(values: Iterable<T | PromiseLike<T>>): Promise<PromiseSettledResult<Awaited<T>>[]>;

-}