squash!

PlayForm · Jun 26, 2024 · 80bc91e · 80bc91e
1 parent 8230645
commit 80bc91e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 45 deletions.
diff --git a/Target/Class/Pipe.d.ts b/Target/Class/Pipe.d.ts
@@ -25,18 +25,4 @@ export declare const Cache: {
     Fulfilled: ({ File }: Plan) => Promise<string | false>;
     Changed: (Plan: Plan) => Promise<Plan>;
 };
-<<<<<<< HEAD
 export declare const Merge: <Ts extends readonly unknown[]>(...objects: Ts) => import("deepmerge-ts").DeepMergeHKT<Ts, import("deepmerge-ts").GetDeepMergeFunctionsURIs<{}>, import("deepmerge-ts").DeepMergeBuiltInMetaData>;
-=======
-export declare const Merge: <Ts extends readonly unknown[]>(...objects: Ts) => import("deepmerge-ts").DeepMergeHKT<Ts, Readonly<{
-    DeepMergeRecordsURI: "DeepMergeRecordsDefaultURI";
-    DeepMergeArraysURI: "DeepMergeArraysDefaultURI";
-    DeepMergeSetsURI: "DeepMergeSetsDefaultURI";
-    DeepMergeMapsURI: "DeepMergeMapsDefaultURI";
-    DeepMergeOthersURI: "DeepMergeLeafURI";
-    DeepMergeFilterValuesURI: "DeepMergeFilterValuesDefaultURI";
-}>, Readonly<{
-    key: PropertyKey;
-    parents: readonly Readonly<Record<PropertyKey, unknown>>[];
-}>>;
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
diff --git a/Target/Function/Merge.d.ts b/Target/Function/Merge.d.ts
@@ -2,19 +2,5 @@
  * @module Merge
  *
  */
-<<<<<<< HEAD
 declare const _default: <Ts extends readonly unknown[]>(...objects: Ts) => import("deepmerge-ts").DeepMergeHKT<Ts, import("deepmerge-ts").GetDeepMergeFunctionsURIs<{}>, import("deepmerge-ts").DeepMergeBuiltInMetaData>;
-=======
-declare const _default: <Ts extends readonly unknown[]>(...objects: Ts) => import("deepmerge-ts").DeepMergeHKT<Ts, Readonly<{
-    DeepMergeRecordsURI: "DeepMergeRecordsDefaultURI";
-    DeepMergeArraysURI: "DeepMergeArraysDefaultURI";
-    DeepMergeSetsURI: "DeepMergeSetsDefaultURI";
-    DeepMergeMapsURI: "DeepMergeMapsDefaultURI";
-    DeepMergeOthersURI: "DeepMergeLeafURI";
-    DeepMergeFilterValuesURI: "DeepMergeFilterValuesDefaultURI";
-}>, Readonly<{
-    key: PropertyKey;
-    parents: readonly Readonly<Record<PropertyKey, unknown>>[];
-}>>;
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
 export default _default;
diff --git a/Target/Function/Pipe.d.ts b/Target/Function/Pipe.d.ts
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-/// <reference types="node" />
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
 /**
  * @module Pipe
  *

diff --git a/Target/Interface/Cache.d.ts b/Target/Interface/Cache.d.ts
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-/// <reference types="node" />
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
 /**
  * @module Plan
  *

diff --git a/Target/Type/Buffer.d.ts b/Target/Type/Buffer.d.ts
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-=======
-/// <reference types="node" />
-/// <reference types="node" />
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
 /**
  * @module Buffer
  *

diff --git a/Target/Type/Path.d.ts b/Target/Type/Path.d.ts
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-/// <reference types="node" />
->>>>>>> 17847992916f4336ac0bcf48dfc7b8597c47fd6f
 /**
  * @module Path
  *