Merge conflict

1 files changed, 0 insertions, 35 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2019.object.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2019.object.d.ts
deleted file mode 100644
index 059187e..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2019.object.d.ts
+++ /dev/null
@@ -1,35 +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"/>

-
-
-/// <reference lib="es2015.iterable" />

-

-interface ObjectConstructor {

-    /**

-     * Returns an object created by key-value entries for properties and methods

-     * @param entries An iterable object that contains key-value entries for properties and methods.

-     */

-    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T };

-

-    /**

-     * Returns an object created by key-value entries for properties and methods

-     * @param entries An iterable object that contains key-value entries for properties and methods.

-     */

-    fromEntries(entries: Iterable<readonly any[]>): any;

-}