From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Sun, 17 Jul 2016 00:54:32 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=f2cb10f2c68918ea8fe5501bbd05a096d917408d;hp=554f9d46f2dc3914559c8eb1548ee951e4b9e3a3;p=clearscm.git

Merge branch 'master' of defaria.com:/opt/git/clearscm
---

diff --git a/rc/bash_login b/rc/bash_login
index 8e47493..d163c7b 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -300,6 +300,9 @@ export DISPLAY=${DISPLAY:-:0}
 # Reset home in case it changed
 HOME=$saved_home
 
+# Odd but Eclipse's Egit can't seem to work with defaria.com unless this is set.
+export GIT_SSH=/usr/bin/ssh
+
 # Now go home (in case we were not autmatically cd'ed there)
 if [ $(id -u) -ne 0 ]; then
   cd
diff --git a/web/Resumes/Andrew/Resume.doc b/web/Resumes/Andrew/Resume.doc
index a4a52c3..3516916 100644
Binary files a/web/Resumes/Andrew/Resume.doc and b/web/Resumes/Andrew/Resume.doc differ
diff --git a/web/Resumes/Andrew/Resume.docx b/web/Resumes/Andrew/Resume.docx
index 6752c94..c2327cb 100644
Binary files a/web/Resumes/Andrew/Resume.docx and b/web/Resumes/Andrew/Resume.docx differ
diff --git a/web/Resumes/Andrew/Resume.odt b/web/Resumes/Andrew/Resume.odt
index 3367c19..b85a63a 100644
Binary files a/web/Resumes/Andrew/Resume.odt and b/web/Resumes/Andrew/Resume.odt differ