Hopefully fix conflict.

This commit is contained in:
Acrimon 2019-07-24 02:02:22 +02:00
parent deb6c6adef
commit b1e1cb0f00

View File

@ -9,5 +9,5 @@ server = { package = "veloren-server", path = "../server" }
common = { package = "veloren-common", path = "../common" }
log = "0.4"
pretty_env_logger = "0.3"
heaptrack = "0.3.0"
pretty_env_logger = "0.3"