Resolve conflict

SakaDream · SakaDream · commit 008ef67d96bc · 2019-06-09T11:29:53.000+07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,6 @@ derive_more = "0.15.0"
 jsonwebtoken = "6.0.1"
 bcrypt = "0.4.0"
 time = "0.1.42"
-toml = "0.5.1"
 
 [dependencies.diesel]
 version = "1.4.2"
