Resolved conflicts with the previous pull request

This commit is contained in:
unsettledgames
2021-08-14 22:47:49 +02:00
parent a773bba05c
commit 017ef3b6f5
9 changed files with 41 additions and 285 deletions

View File

@ -38,8 +38,6 @@
//=include _colorPicker.js
//=include _paletteBlock.js
//=include SplashPage.js
//=include _pixelExport.js
//=include _saveProject.js
/**buttons**/
//=include _toolButtons.js