pyOpenSci
diff --git a/‎.gitignore
Lines changed: 6 additions & 0 deletions b/‎.gitignore
Lines changed: 6 additions & 0 deletions
diff --git a/‎images/tutorials/code-to-script-diagram.png renamed to ‎images/tutorials/code-to-python-package.png b/‎images/tutorials/code-to-script-diagram.png renamed to ‎images/tutorials/code-to-python-package.png
@@ -7,6 +7,12 @@ tmp/
 __pycache__
 *notes-from-review.md
 *.idea*
+<<<<<<< HEAD
 
 .vale.ini
 styles/*
+=======
+# grammar / syntax checkers
+.vale.ini
+styles/
+>>>>>>> 7e6685f (Rename diagram)