squash!

PlayForm · May 22, 2024 · 8b806d2 · 8b806d2
2 parents f23cd01 + 6c5b578
commit 8b806d2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/Target/Function/Integration.d.ts b/Target/Function/Integration.d.ts
@@ -2,6 +2,7 @@
  * @module Integration
  *
  */
+<<<<<<< HEAD
 declare const _default: Interface;
 export default _default;
 import type Interface from "../Interface/Integraton.js";
@@ -36,3 +37,30 @@ export declare const Default: Omit<{} & {
     Exclude: boolean;
 }, "__proto__">;
 export declare const Merge: import("@playform/build/Target/Interface/Merge.js").default<import("@playform/build/Target/Interface/Merge.js").Generic>;
+=======
+<<<<<<< HEAD
+declare const _default: (Option: import("@playform/pipe/Target/Interface/Option.js").default) => {
+    name: string;
+    hooks: {
+        "astro:build:done": ({ dir }: {
+            pages: {
+                pathname: string;
+            }[];
+            dir: URL;
+            routes: import("astro").RouteData[];
+            logger: import("astro").AstroIntegrationLogger;
+            cacheManifest: boolean;
+        }) => void;
+    };
+};
+export default _default;
+export declare const Default: any;
+export declare const Merge: any;
+=======
+declare const _default: Interface;
+export default _default;
+import type Interface from "../Interface/Integraton.js";
+export declare const Default: any;
+export declare const Merge: Interface<Generic>;
+>>>>>>> c5e311607f46e35736c59843f04e4850fb9290fd
+>>>>>>> 6c5b578f53d1c28a0b8a8e76678f3fc52fb08174
diff --git a/Target/Variable/Option.d.ts b/Target/Variable/Option.d.ts
@@ -2,6 +2,7 @@
  * @module Option
  *
  */
+<<<<<<< HEAD
 declare const _default: Omit<{} & {
     File: string;
     Cache: {
@@ -32,4 +33,7 @@ declare const _default: Omit<{} & {
     }, "__proto__">;
     Exclude: boolean;
 }, "__proto__">;
+=======
+declare const _default: any;
+>>>>>>> 6c5b578f53d1c28a0b8a8e76678f3fc52fb08174
 export default _default;