Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-22 04:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge error

Browse source
This commit is contained in:
Richard Davey 2024-02-21 13:25:08 +00:00
parent c445303ffb
commit ff945e1595
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gameobjects/nineslice/NineSliceRender.js
View file

@ -13,14 +13,6 @@ if (typeof WEBGL_RENDERER)
renderWebGL = require('./NineSliceWebGLRenderer'); 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 = { module.exports = {
renderWebGL: renderWebGL, renderWebGL: renderWebGL,