master merge conflict

This commit is contained in:
aniisaaden
2020-09-28 16:58:53 +02:00
parent e21467c04f
commit 0598ae5c1c
+1
View File
@@ -28,6 +28,7 @@ asset.require('examples/pointscloud')
--- TESTELITEST ---
assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
assetHelper.requireAll(asset, 'scene/digitaluniverse')
-- Load default key bindings applicable to most scenes