Merge conflict

1 files changed, 0 insertions, 41 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2015.proxy.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2015.proxy.d.ts
deleted file mode 100644
index 39ac6a3..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2015.proxy.d.ts
+++ /dev/null
@@ -1,41 +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 ProxyHandler<T extends object> {

-    apply?(target: T, thisArg: any, argArray: any[]): any;

-    construct?(target: T, argArray: any[], newTarget: Function): object;

-    defineProperty?(target: T, p: string | symbol, attributes: PropertyDescriptor): boolean;

-    deleteProperty?(target: T, p: string | symbol): boolean;

-    get?(target: T, p: string | symbol, receiver: any): any;

-    getOwnPropertyDescriptor?(target: T, p: string | symbol): PropertyDescriptor | undefined;

-    getPrototypeOf?(target: T): object | null;

-    has?(target: T, p: string | symbol): boolean;

-    isExtensible?(target: T): boolean;

-    ownKeys?(target: T): ArrayLike<string | symbol>;

-    preventExtensions?(target: T): boolean;

-    set?(target: T, p: string | symbol, value: any, receiver: any): boolean;

-    setPrototypeOf?(target: T, v: object | null): boolean;

-}

-

-interface ProxyConstructor {

-    revocable<T extends object>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };

-    new <T extends object>(target: T, handler: ProxyHandler<T>): T;

-}

-declare var Proxy: ProxyConstructor;