merged changes already in the repository

2016-09-29 16:37:52 -07:00
parent aca1cdd6ca a4f1bdc7ca
commit 42f58df6e3
3 changed files with 12 additions and 1 deletions
@@ -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