Skip to content

Commit 01ee239

Browse files
tardyptardyp
committed
Merge remote-tracking branch 'tardyp/setuppy'
this commit contains lots of merge conflicts resolution and fixes use git diff to figure out diff between the two version (original and setuppy)
2 parents 21b7fbe + 63e3bfd commit 01ee239

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+894
-399
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
*.asc
22
*.egg-info/
33
*.log
4+
build
5+
dist
6+
e2e
47
*.pyc
58
__pycache__
69
/dist
@@ -10,3 +13,4 @@ __pycache__
1013

1114
# PyCharm related
1215
/.idea/
16+
/.vscode/

0 commit comments

Comments
 (0)