Skip to content

Commit 1951ab2

Browse files
committed
Resolved merge conflict on scene.js (texture was added)
2 parents 0dfa895 + 20aeec2 commit 1951ab2

19 files changed

Lines changed: 51 additions & 41 deletions
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit fb1dda15029ab2aec50582f40f88facec29d202b

package-lock.json

Lines changed: 21 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/textures/jupiter.png

419 KB
Loading

public/textures/planet1.png

231 KB
Loading

public/textures/planet2.png

225 KB
Loading

public/textures/planet3.png

101 KB
Loading

public/textures/planet4.png

31.9 KB
Loading

public/textures/planet5.png

301 KB
Loading

public/textures/planet6.png

237 KB
Loading

public/textures/planet7.png

368 KB
Loading

0 commit comments

Comments
 (0)