fix warnings

Author: ghubertpalo

mithril-common/Cargo.toml

@@ -16,7 +16,11 @@ hex = "0.4.3"
 http = "0.2.6"
 jsonschema = "0.12.2"
 mithril = { path = "../mithril-core" }
+<<<<<<< HEAD
 mockall = "0.11.0"
+=======
+nom = "7.1"
+>>>>>>> fix warnings
 rand_chacha = "0.3.1"
 rand_core   = "0.6.3"
 serde = { version = "1.0", features = ["derive"] }
@@ -28,5 +32,4 @@ thiserror = "1.0.31"
 tokio = { version = "1.17.0", features = ["full"] }
 walkdir = "2"
 warp = "0.3"
-nom = "7.1"