Merge remote-tracking branch 'origin/main'

mstrand1 · mstrand1 · commit ab5ef6e83947 · 2021-08-07T02:20:06.000-07:00
# Conflicts:
#	nanalysis.egg-info/PKG-INFO
#	nanalysis.egg-info/SOURCES.txt
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ build/
 dist/
 .idea/
 nanalysis.egg-info/
+test.py

-Original file line number
+Diff line change
 dist/
 .idea/
 nanalysis.egg-info/
 +test.py