fixup! misko: fixes

QwikDev · Dec 6, 2023 · 3bdf043 · 3bdf043
1 parent fb783f6
commit 3bdf043
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/qwik/src/core/api.md b/packages/qwik/src/core/api.md
@@ -725,11 +725,7 @@ export type QwikFocusEvent<T = Element> = NativeFocusEvent;
 export interface QwikIntrinsicElements extends IntrinsicHTMLElements {
     // Warning: (ae-forgotten-export) The symbol "QwikCustomHTMLAttributes" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "QwikCustomHTMLElement" needs to be exported by the entry point index.d.ts
-<<<<<<< Updated upstream
     [key: string]: {} | QwikCustomHTMLAttributes<QwikCustomHTMLElement>;
-=======
-    [key: string]: QwikCustomHTMLAttributes<QwikCustomHTMLElement> | {} | null;
->>>>>>> Stashed changes
 }
 
 // @public @deprecated (undocumented)