Merge conflict

1 files changed, 0 insertions, 51 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2017.object.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2017.object.d.ts
deleted file mode 100644
index a688e15..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2017.object.d.ts
+++ /dev/null
@@ -1,51 +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 ObjectConstructor {

-    /**

-     * Returns an array of values of the enumerable properties of an object

-     * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.

-     */

-    values<T>(o: { [s: string]: T } | ArrayLike<T>): T[];

-

-    /**

-     * Returns an array of values of the enumerable properties of an object

-     * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.

-     */

-    values(o: {}): any[];

-

-    /**

-     * Returns an array of key/values of the enumerable properties of an object

-     * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.

-     */

-    entries<T>(o: { [s: string]: T } | ArrayLike<T>): [string, T][];

-

-    /**

-     * Returns an array of key/values of the enumerable properties of an object

-     * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.

-     */

-    entries(o: {}): [string, any][];

-

-    /**

-     * Returns an object containing all own property descriptors of an object

-     * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.

-     */

-    getOwnPropertyDescriptors<T>(o: T): {[P in keyof T]: TypedPropertyDescriptor<T[P]>} & { [x: string]: PropertyDescriptor };

-}