Resolved conflict for PR #161

zerotier · Jan 12, 2022 · f47d848 · f47d848
1 parent 7b2bbc1
commit f47d848
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18,625 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@ ports/xcode_macos/
 products/
 tmp/
 API.pdf
+cache/
+dist/
 
 # ZeroTier-specific 
 *.conf
@@ -47,9 +49,20 @@ gen/
 
 # Python
 *.py[co]
-packages/PyPI/libzt.egg-info/
 *.pypirc
 __pycache__/
+*.egg-info/
+pkg/pypi/dist/
+pkg/pypi/libzt/libzt.py
+pkg/pypi/libzt/node.py
+pkg/pypi/libzt/select.py
+pkg/pypi/libzt/sockets.py
+pkg/pypi/native
+pkg/pypi/LICENSE
+
+# SWIG
+src/bindings/python/libzt.py
+src/bindings/python/zt_wrap.*
 
 # Junk
 *.DS_Store