fixup! misko: fixes

QwikDev · Dec 6, 2023 · fb783f6 · fb783f6
1 parent a63a8e3
commit fb783f6
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/packages/qwik/src/core/render/jsx/types/jsx-qwik-elements.ts b/packages/qwik/src/core/render/jsx/types/jsx-qwik-elements.ts
@@ -40,15 +40,9 @@ export interface QwikIntrinsicAttributes {
  * @public
  */
 export interface QwikIntrinsicElements extends IntrinsicHTMLElements {
-<<<<<<< Updated upstream
   /**
    * Custom DOM elements can have any name We need to add the empty object to match the type with
    * the Intrinsic elements
    */
   [key: string]: {} | QwikCustomHTMLAttributes<QwikCustomHTMLElement>;
-=======
-  // We need to add `{}` to match the type with the Intrinsic elements
-  /** Custom DOM elements can have any name */
-  [key: string]: QwikCustomHTMLAttributes<QwikCustomHTMLElement> | {} | null;
->>>>>>> Stashed changes
 }