Merge branch 'master' of /opt/git/clearscm

Conflicts:
	web/Resumes/Andrew/index.php

diff --git a/lib/Utils.pm b/lib/Utils.pm
index a21d996..acebce5 100644 (file)
--- a/lib/Utils.pm
+++ b/lib/Utils.pm
@@ -529,7 +529,7 @@ Returns:
 
 =cut
 
-  open my $pipe, '|', $to 
+  open my $pipe, '|-', $to 
     or error "Unable to open pipe - $!", 1;
 
   foreach (@output) {

diff --git a/rc/bash_login b/rc/bash_login
index 306e82f..1084f41 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -264,6 +264,9 @@ if [ -d /opt/clearscm/lib ]; then
   export PERL5LIB="$PERL5LIB:/opt/clearscm/lib"
 fi
 
+# Lessfile
+eval $(lessfile)
+
 # Client specific customizations
 for script in $(\ls ~/.rc/client_scripts); do
   # This is not working as long as ACLs are not supported from the remote

diff --git a/web/Resumes/Andrew/Resume.doc b/web/Resumes/Andrew/Resume.doc
index e1f070e..a9b799c 100644 (file)
Binary files a/web/Resumes/Andrew/Resume.doc and b/web/Resumes/Andrew/Resume.doc differ

diff --git a/web/Resumes/Andrew/index.php b/web/Resumes/Andrew/index.php
index b300b10..25dc339 100644 (file)
--- a/web/Resumes/Andrew/index.php
+++ b/web/Resumes/Andrew/index.php
@@ -187,7 +187,6 @@ function stoptimer () {
   JIRA setup and integration of Salesforce with JIRA.</p>
 
   <p>Also helped administer and support a wide array of engineering tools such as Perforce, Jama, Jira, Git, Gerrit, Bugzilla, Autobuilder, Build Script, Jenkins, Confluence and Swarm.</p>
-
   <hr noshade>
 
   <p><a href="http://www.axcient.com"><img src="Axcient.png" alt="Axcient" border="0"></a></p>