From 07ce7e064ee8a7c2cb90554dfba50bf68e1aebc6 Mon Sep 17 00:00:00 2001
From: Acrimon <joel.wejdenstal@gmail.com>
Date: Wed, 24 Jul 2019 02:02:22 +0200
Subject: [PATCH] Hopefully fix conflict.

---
 server-cli/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml
index 0fa0113076..fa7f23696e 100644
--- a/server-cli/Cargo.toml
+++ b/server-cli/Cargo.toml
@@ -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"