Skip to content

Commit 38c3914

Browse files
jakob-keller12rambau
authored andcommitted
build(poetry): rely on pip for resolving termcolor dependency on Python < 3.7
1 parent a3d209f commit 38c3914

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ python = "^3.7"
5959
questionary = "^1.4.0"
6060
decli = "^0.5.2"
6161
colorama = "^0.4.1"
62+
<<<<<<< HEAD
6263
termcolor = ">= 1.1, < 3"
64+
=======
65+
termcolor = ">=1.1,<3"
66+
>>>>>>> 48c100d (build(poetry): rely on pip for resolving `termcolor` dependency on Python < 3.7)
6367
packaging = ">=19"
6468
tomlkit = ">=0.5.3,<1.0.0"
6569
jinja2 = ">=2.10.3"

0 commit comments

Comments
 (0)