Skip to main content
Explore
Sign in
Explore
Snippets Groups Projects
Commit 75efcca7 authored by Henning Fehrmann's avatar Henning Fehrmann Committed by Henning Fehrmann
Browse files

corrected merge conflicts

parent a2bdb973
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 7 deletions
fio.sh
+ 0
− 7
View file @ 75efcca7
...@@ -42,16 +42,9 @@ case "$1" in ...@@ -42,16 +42,9 @@ case "$1" in
stop|kill) stop|kill)
pkill iozone pkill iozone
;; ;;
<<<<<<< HEAD
getresults) getresults)
getresults $2 getresults $2
;; ;;
=======
getresults)
getresults $2
;;
>>>>>>> 6e4d690ef650714529fcadd497a456884ca93ff6
*) *)
echo "Usage: $0 {start|run|stop|kill|getresults)" echo "Usage: $0 {start|run|stop|kill|getresults)"
exit 1 exit 1
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

AEI Privacy Policy Imprint