.

lechgu · Jan 18, 2020 · ec009cb · ec009cb
1 parent bec396c
commit ec009cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/hush/console.py b/hush/console.py
@@ -9,11 +9,7 @@
 from . import keypairs, passwords, secrets
 
 DEFAULT_CONFIG_FILE = "~/.hush"
-<<<<<<< HEAD
 DEFAULT_PASSWORD_LENGTH = 16
-=======
-DEFAULT_PASSWORD_LENGTH = 8
->>>>>>> master
 DEFAULT_CHARACTER_CLASSES = "aA8#"
 
 
@@ -68,7 +64,7 @@ def config_callback(ctx, param, value):
 
 
 @click.group()
-@click.version_option("202001.2")
+@click.version_option("202001.3")
 @click.option(
     "-c",
     "--config-file",

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ multi_line_output=3
 include_trailing_comma = true
 
 [pycalver]
-current_version = "v202001.0002"
+current_version = "v202001.0003"
 version_pattern = "{pycalver}"
 commit = false
 tag = false