Merge conflict

1 files changed, 0 insertions, 39 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2019.string.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2019.string.d.ts
deleted file mode 100644
index 7b61a41..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2019.string.d.ts
+++ /dev/null
@@ -1,39 +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 String {

-    /** Removes the trailing white space and line terminator characters from a string. */

-    trimEnd(): string;

-

-    /** Removes the leading white space and line terminator characters from a string. */

-    trimStart(): string;

-

-    /**

-     * Removes the leading white space and line terminator characters from a string.

-     * @deprecated A legacy feature for browser compatibility. Use `trimStart` instead

-     */

-    trimLeft(): string;

-

-    /**

-     * Removes the trailing white space and line terminator characters from a string.

-     * @deprecated A legacy feature for browser compatibility. Use `trimEnd` instead

-     */

-    trimRight(): string;

-}