Skip to content

Commit 271f50b

Browse files
jenstroegeradam-grant-hendry
authored andcommitted
feat: add major-version-zero option to support initial package development
1 parent c73827d commit 271f50b

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

commitizen/defaults.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ class Settings(TypedDict, total=False):
4040
style: Optional[List[Tuple[str, str]]]
4141
customize: CzSettings
4242
major_version_zero: bool
43+
<<<<<<< HEAD
4344
encoding: str
4445
major_version_zero: bool
46+
=======
47+
>>>>>>> 366081c (feat: add major-version-zero option to support initial package development)
4548

4649

4750
name: str = "cz_conventional_commits"
@@ -69,10 +72,6 @@ class Settings(TypedDict, total=False):
6972
"use_shortcuts": False,
7073
"encoding": "utf-8",
7174
"major_version_zero": False,
72-
"encoding": "utf-8",
73-
"major_version_zero": False,
74-
"encoding": "utf-8",
75-
"major_version_zero": False,
7675
}
7776

7877
MAJOR = "MAJOR"

tests/test_conf.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050
"use_shortcuts": False,
5151
"encoding": "utf-8",
5252
"major_version_zero": False,
53-
"encoding": "utf-8",
54-
"major_version_zero": False,
55-
"encoding": "utf-8",
56-
"major_version_zero": False,
5753
}
5854

5955
_new_settings = {
@@ -71,10 +67,6 @@
7167
"use_shortcuts": False,
7268
"encoding": "utf-8",
7369
"major_version_zero": False,
74-
"encoding": "utf-8",
75-
"major_version_zero": False,
76-
"encoding": "utf-8",
77-
"major_version_zero": False,
7870
}
7971

8072
_read_settings = {

0 commit comments

Comments
 (0)