Skip to content
Snippets Groups Projects
Commit ad6dd0f2 authored by Venkat Malladi's avatar Venkat Malladi
Browse files

remove merge conlfict lines.

parent bdf079e6
Branches
Tags
1 merge request!67Resolve "Rename Plot profile to be consistent with naming"
Pipeline #6581 failed with stages
in 7 hours, 5 minutes, and 31 seconds
Hide whitespace changes
Inline Side-by-side
workflow/scripts/plot_profile.sh
+ 0
− 4
View file @ ad6dd0f2
......@@ -69,11 +69,7 @@ run_main() {
# Parsing options
OPTIND=1 # Reset OPTIND
<<<<<<< HEAD
while getopts :g:h opt
=======
while getopts g:h opt
>>>>>>> 61db854ac1fcdb60431ad48a0a5cab0255d9c2d3
do
case $opt in
g) gtf=$OPTARG;;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment