From ff945e15953a2048b33997680569c03413086eaa Mon Sep 17 00:00:00 2001
From: Richard Davey <rich@photonstorm.com>
Date: Wed, 21 Feb 2024 13:25:08 +0000
Subject: [PATCH] Fix merge error

---
 src/gameobjects/nineslice/NineSliceRender.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/gameobjects/nineslice/NineSliceRender.js b/src/gameobjects/nineslice/NineSliceRender.js
index f60279989..2e1c3abc9 100644
--- a/src/gameobjects/nineslice/NineSliceRender.js
+++ b/src/gameobjects/nineslice/NineSliceRender.js
@@ -13,14 +13,6 @@ if (typeof WEBGL_RENDERER)
     renderWebGL = require('./NineSliceWebGLRenderer');
 }
 
-<<<<<<< HEAD
-=======
-if (typeof CANVAS_RENDERER)
-{
-    // renderCanvas = require('./MeshCanvasRenderer');
-}
-
->>>>>>> parent of 7aaa976a4 (Updated webpack config DefinePlugin use and corresponding defs to allow those crazy souls who import source directly on node to have a better life #6644)
 module.exports = {
 
     renderWebGL: renderWebGL,