typo in string

src/webgl/p5.RendererGL.js

@@ -276,11 +276,7 @@ class RendererGL extends Renderer3D {
 
     if (!glBuffers) return;
 
-<<<<<<< HEAD
-    if (this._curShader.shaderType === 'stroke') {
-=======
     if (this._curShader.shaderType === 'stroke'){
->>>>>>> f0875d795be9297bcdf9b312dffcafeda4741536
       if (count === 1) {
         gl.drawArrays(gl.TRIANGLES, 0, geometry.lineVertices.length / 3);
        } else {
@@ -296,10 +292,7 @@ class RendererGL extends Renderer3D {
             "🌸 p5.js says: Instancing is only supported in WebGL2 mode"
           );
         }
-<<<<<<< HEAD
        }
-=======
->>>>>>> f0875d795be9297bcdf9b312dffcafeda4741536
     } else if (glBuffers.indexBuffer) {
       this._bindBuffer(glBuffers.indexBuffer, gl.ELEMENT_ARRAY_BUFFER);
 

src/webgpu/p5.RendererWebGPU.js

@@ -675,7 +675,7 @@ class RendererWebGPU extends Renderer3D {
       new RegExp(`struct\\s+${structName}\\s*\\{([^\\}]+)\\}`)
     );
     if (!structMatch) {
-      throw new Error(`Can't find a struct defnition for ${structName}`);
+      throw new Error(`Can't find a struct definition for ${structName}`);
     }
 
     const structBody = structMatch[1];