Skip to content

Commit ca7b3df

Browse files
BashamegaBashamega
committed
-
1 parent 3e09c30 commit ca7b3df

17 files changed

+0
-53
lines changed

‎baselines/dom.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36209,10 +36209,7 @@ interface WebGLRenderingContextBase {
3620936209
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3621036210
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3621136211
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36212-
<<<<<<< HEAD
3621336212
getExtension(name: string): any;
36214-
=======
36215-
>>>>>>> parent of ae72c10f (Fix order)
3621636213
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3621736214
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3621836215
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/serviceworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9883,10 +9883,7 @@ interface WebGLRenderingContextBase {
98839883
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98849884
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98859885
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9886-
<<<<<<< HEAD
98879886
getExtension(name: string): any;
9888-
=======
9889-
>>>>>>> parent of ae72c10f (Fix order)
98909887
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98919888
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98929889
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/sharedworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9420,10 +9420,7 @@ interface WebGLRenderingContextBase {
94209420
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94219421
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94229422
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9423-
<<<<<<< HEAD
94249423
getExtension(name: string): any;
9425-
=======
9426-
>>>>>>> parent of ae72c10f (Fix order)
94279424
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94289425
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94299426
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.5/dom.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36183,10 +36183,7 @@ interface WebGLRenderingContextBase {
3618336183
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3618436184
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3618536185
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36186-
<<<<<<< HEAD
3618736186
getExtension(name: string): any;
36188-
=======
36189-
>>>>>>> parent of ae72c10f (Fix order)
3619036187
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3619136188
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3619236189
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.5/serviceworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9880,10 +9880,7 @@ interface WebGLRenderingContextBase {
98809880
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98819881
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98829882
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9883-
<<<<<<< HEAD
98849883
getExtension(name: string): any;
9885-
=======
9886-
>>>>>>> parent of ae72c10f (Fix order)
98879884
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98889885
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98899886
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.5/sharedworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9417,10 +9417,7 @@ interface WebGLRenderingContextBase {
94179417
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94189418
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94199419
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9420-
<<<<<<< HEAD
94219420
getExtension(name: string): any;
9422-
=======
9423-
>>>>>>> parent of ae72c10f (Fix order)
94249421
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94259422
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94269423
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.5/webworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11314,10 +11314,7 @@ interface WebGLRenderingContextBase {
1131411314
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
1131511315
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
1131611316
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
11317-
<<<<<<< HEAD
1131811317
getExtension(name: string): any;
11319-
=======
11320-
>>>>>>> parent of ae72c10f (Fix order)
1132111318
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
1132211319
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
1132311320
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.6/dom.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36206,10 +36206,7 @@ interface WebGLRenderingContextBase {
3620636206
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3620736207
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3620836208
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36209-
<<<<<<< HEAD
3621036209
getExtension(name: string): any;
36211-
=======
36212-
>>>>>>> parent of ae72c10f (Fix order)
3621336210
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3621436211
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3621536212
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.6/serviceworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9880,10 +9880,7 @@ interface WebGLRenderingContextBase {
98809880
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98819881
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98829882
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9883-
<<<<<<< HEAD
98849883
getExtension(name: string): any;
9885-
=======
9886-
>>>>>>> parent of ae72c10f (Fix order)
98879884
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98889885
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98899886
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

‎baselines/ts5.6/sharedworker.generated.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9417,10 +9417,7 @@ interface WebGLRenderingContextBase {
94179417
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94189418
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94199419
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9420-
<<<<<<< HEAD
94219420
getExtension(name: string): any;
9422-
=======
9423-
>>>>>>> parent of ae72c10f (Fix order)
94249421
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94259422
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94269423
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

0 commit comments

Comments
 (0)