merged changes already in the repository

bash/get_deliveries.sh

@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 search_string="$1";
 echo $search_string;
 find . -n "'*$search_string*'";
 
+=======
+search_string=$1;
+for i in $(find . -type d -maxdepth 1 -name '*$search_String*'); do find "$i" -type d -name '*ivery*' -exec find {} -name '*mov' \;; done
+>>>>>>> a4f1bdc7ca935a4d555d2c313b1317af6b687756

bash/make_h264.sh

@@ -1,4 +1,8 @@
 for i;
+<<<<<<< HEAD
 	do ffmpeg -i "$i" -c:v libx264 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 -vb 5000k "${i%.*}_h264.mov" ;
+=======
+	do ffmpeg -i "$i" -c:v libx264 -profile:v main -pix_fmt yuv420p -q 0 -strict -2 "${i%.*}_h264.mov" ;
+>>>>>>> a4f1bdc7ca935a4d555d2c313b1317af6b687756
 done;
 	

bash/mount_whitehorse.command

@@ -10,7 +10,7 @@ mkdir /Volumes/whitehorse
 mount -t smbfs //mak:ale2312x@makineisilon/whitehorse /Volumes/whitehorse
 echo mounting pegasus
 mkdir /Volumes/pegasus
-mount -t smbfs //jorge:Ladilla3@mak-nas/pegasus /Volumes/pegasus
+mount -t smbfs //eduardo:"pgss%401046"@mak-nas/pegasus /Volumes/pegasus
 echo done.
 sleep 1
 open -a trolCommander
@@ -24,6 +24,8 @@ echo '| $$      | $$  | $$| $$\  $$$| $$    $$| $$  | $$        | $$  | $$\  $$$
 echo '| $$      |  $$$$$$/| $$ \  $$|  $$$$$$/| $$  | $$       /$$$$$$| $$ \  $$';
 echo '|__/       \______/ |__/  \__/ \______/ |__/  |__/      |______/|__/  \__/';
 
+log_punch.sh in
+
 sleep 25
 
 "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" https://timeandlabor.paychex.com/secure/Login.aspx?Alias=0083A8306102 --args --"profile-direory"="Profile 2" > /tmp/chromelog.log &