projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 298db9c)
Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Mon, 9 Dec 2013 18:00:32 +0000 (10:00 -0800)
committerAndrew DeFaria <Andrew@DeFaria.com>
Mon, 9 Dec 2013 18:00:32 +0000 (10:00 -0800)
Conflicts:
web/Resumes/Andrew/Resume.doc

web/Resumes/Andrew/Resume.doc patch | blob | history

diff --git a/web/Resumes/Andrew/Resume.doc b/web/Resumes/Andrew/Resume.doc
index e650379..c339eee 100644 (file)
Binary files a/web/Resumes/Andrew/Resume.doc and b/web/Resumes/Andrew/Resume.doc differ
ClearSCM Source Repository. Note parts of this repo are under GPL. Other parts are copyright ClearSCM, Inc.