Skip to content

Commit ee22960

Browse files
New readme
1 parent c893acb commit ee22960

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ parts/
2020
sdist/
2121
var/
2222
wheels/
23+
<<<<<<< HEAD
24+
=======
25+
pip-wheel-metadata/
26+
>>>>>>> 892da8f00d4ce0b5f981ca1329f6b076693c0ad7
2327
share/python-wheels/
2428
*.egg-info/
2529
.installed.cfg
@@ -49,7 +53,10 @@ coverage.xml
4953
*.py,cover
5054
.hypothesis/
5155
.pytest_cache/
56+
<<<<<<< HEAD
5257
cover/
58+
=======
59+
>>>>>>> 892da8f00d4ce0b5f981ca1329f6b076693c0ad7
5360

5461
# Translations
5562
*.mo
@@ -72,7 +79,10 @@ instance/
7279
docs/_build/
7380

7481
# PyBuilder
82+
<<<<<<< HEAD
7583
.pybuilder/
84+
=======
85+
>>>>>>> 892da8f00d4ce0b5f981ca1329f6b076693c0ad7
7686
target/
7787

7888
# Jupyter Notebook
@@ -83,9 +93,13 @@ profile_default/
8393
ipython_config.py
8494

8595
# pyenv
96+
<<<<<<< HEAD
8697
# For a library or package, you might want to ignore these files since the code is
8798
# intended to run in multiple environments; otherwise, check them in:
8899
# .python-version
100+
=======
101+
.python-version
102+
>>>>>>> 892da8f00d4ce0b5f981ca1329f6b076693c0ad7
89103

90104
# pipenv
91105
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -130,6 +144,7 @@ dmypy.json
130144

131145
# Pyre type checker
132146
.pyre/
147+
<<<<<<< HEAD
133148

134149
# pytype static type analyzer
135150
.pytype/
@@ -145,3 +160,4 @@ cython_debug/
145160
out/
146161
# Pycharm config dir
147162
.idea/
163+

0 commit comments

Comments
 (0)