Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
8ca6314ca4
@ -12,12 +12,6 @@ dependencies = [
|
|||||||
"PyVISA==1.14.1",
|
"PyVISA==1.14.1",
|
||||||
"PyVISA-py==0.7.1",
|
"PyVISA-py==0.7.1",
|
||||||
"setuptools==65.5.0",
|
"setuptools==65.5.0",
|
||||||
"typing_extensions==4.9.0",
|
|
||||||
"zeroconf==0.131.0",
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
"typing-extensions==4.9.0",
|
|
||||||
>>>>>>> ee5d585f01664255688748582a87f41dbc4af185
|
|
||||||
]
|
]
|
||||||
authors = [
|
authors = [
|
||||||
{name = "Ali Nwegy", email = "ali.el-nwegy@tuhh.de"},
|
{name = "Ali Nwegy", email = "ali.el-nwegy@tuhh.de"},
|
||||||
@ -25,11 +19,7 @@ authors = [
|
|||||||
license = {text = "MIT"}
|
license = {text = "MIT"}
|
||||||
|
|
||||||
[tool.pdm]
|
[tool.pdm]
|
||||||
<<<<<<< HEAD
|
|
||||||
sdist = true
|
sdist = true
|
||||||
|
|
||||||
[tool.pdm.scripts]
|
[tool.pdm.scripts]
|
||||||
edit = {shell = "$VISUAL src/"}
|
edit = {shell = "$VISUAL src/"}
|
||||||
=======
|
|
||||||
distribution = true
|
|
||||||
>>>>>>> ee5d585f01664255688748582a87f41dbc4af185
|
|
||||||
|
Loading…
Reference in New Issue
Block a user