Merge branch 'dpmayerUSGS-master'

thareUSGS · Dec 21, 2017 · 6621818 · 6621818
2 parents 0616e97 + dfb7064
commit 6621818
Show file tree

Hide file tree

Showing 2 changed files with 384 additions and 421 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Emacs temp files
+*.*~
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,3 +52,6 @@ docs/_build/ @@
     # PyBuilder
     target/
+    # Emacs temp files
+    *.*~