Skip to content

Commit 8eb570a

Browse files
committed
resolved conflict with latest gl-plot3d and gl-axes3d
1 parent a77b9fd commit 8eb570a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"gl-mat4": "^1.2.0",
7979
"gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#1bc50279b8c92c69dbc89258801f66679c7f248a",
8080
"gl-plot2d": "^1.3.1",
81-
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#9d4084b21b977671c2875c437a423e938ee6cee3",
81+
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#97d52a59a8c8ea525753f482361bba73dfee9a18",
8282
"gl-pointcloud2d": "^1.0.1",
8383
"gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#d413bf32b7d4e5109c795324e252c83403609fca",
8484
"gl-select-box": "^1.0.2",

0 commit comments

Comments
 (0)