Merge f15e67fefa into 57286c3887

Julia.gitignore

@@ -4,7 +4,6 @@
 
 # Files generated by invoking Julia with --track-allocation
 *.jl.mem
-*.jl.*.mem
 
 # System-specific files and directories generated by the BinaryProvider and BinDeps packages
 # They contain absolute paths specific to the host computer, and so should not be committed
@@ -27,6 +26,3 @@ Manifest*.toml
 # File generated by the Preferences package to store local preferences
 LocalPreferences.toml
 JuliaLocalPreferences.toml
-
-# Conda environment and metadata created in the project directory by the CondaPkg package
-.CondaPkg/

Python.gitignore

@@ -159,6 +159,10 @@ ENV/
 env.bak/
 venv.bak/
 
+# Conda environments
+conda-meta/
+
+
 # Spyder project settings
 .spyderproject
 .spyproject

README.md

@@ -131,5 +131,3 @@ by automatically forking the project and prompting to send a pull request too.
 
 [CC0-1.0](./LICENSE).
 
-## Test
-This is just a test