Skip to content

Commit 25b78ed

Browse files
committed
resolved conflicts in gl-plot3d
1 parent 98b28ac commit 25b78ed

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"gl-mat4": "^1.2.0",
8181
"gl-mesh3d": "^2.0.8",
8282
"gl-plot2d": "^1.4.2",
83-
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#5f28e06ac02b248e6990ef385d2df49bb3a7baf8",
83+
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#597e656e97a0793d40ff198a94c7621ef56bdcd1",
8484
"gl-pointcloud2d": "^1.0.2",
8585
"gl-scatter3d": "^1.2.0",
8686
"gl-select-box": "^1.0.3",

0 commit comments

Comments
 (0)