merged conflicts manually

2019-10-21 22:32:32 +02:00
parent 813ba56b8e 654f526918
commit 05ba67882c
8 changed files with 73 additions and 19 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "silentdragonlite-cli"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2018"

 [dependencies]