# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1572367755 0
# Node ID 9d522c13ec68aaafaed3e2a8a260eafac46a81f2
# Parent  0354415a8e48a03497b0e7d0f0aca532f39879da# Parent  724d0e149569f8055a7cbc1581bc99549a92f842
Merge accidental heads

diff -r 0354415a8e48 -r 9d522c13ec68 bashrc
--- a/bashrc	Tue Oct 29 16:48:40 2019 +0000
+++ b/bashrc	Tue Oct 29 16:49:15 2019 +0000
@@ -74,4 +74,18 @@
 # Set a hidden R package directory
 export R_LIBS_USER=~/.R/
 # And stop it asking us to save the workspace
-alias R='R --no-save'
\ No newline at end of file
+alias R='R --no-save'
+
+conda_activate() {
+    __conda_setup="$(~/.anaconda3/bin/conda 'shell.bash' 'hook' 2> /dev/null)"
+    if [ $? -eq 0 ]; then
+        eval "$__conda_setup"
+    else
+        if [ -f ~"/.anaconda3/etc/profile.d/conda.sh" ]; then
+            . ~"/.anaconda3/etc/profile.d/conda.sh"
+        else
+            export PATH=~"/.anaconda3/bin:$PATH"
+        fi
+    fi
+    unset __conda_setup
+}
\ No newline at end of file