Skip to content

Commit 27ce5fd

Browse files
authored
Merge pull request #83 from dougransom/main
pyorject.toml
2 parents ba0183d + f2704f1 commit 27ce5fd

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ dynamic = ["version", "description"]
99
requires-python = ">=3.9"
1010
readme = "readme.md"
1111
dependencies= [
12-
<<<<<<< HEAD
1312
"natlink>=5.3.4",
14-
=======
15-
>>>>>>> origin/improveconfig
1613
"FreeSimpleGUI>=5.1.0",
1714
"pydebugstring >= 1.0.0.1",
1815
"dtactions>=1.6.1",

0 commit comments

Comments
 (0)