remove merge conlfict lines.

ad6dd0f2 · Venkat Malladi · bdf079e6 · ad6dd0f2
Commit ad6dd0f2 authored Apr 17, 2020 by Venkat Malladi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

workflow/scripts/plot_profile.sh workflow/scripts/plot_profile.sh +0 -4

No files found.
--- a/workflow/scripts/plot_profile.sh
+++ b/workflow/scripts/plot_profile.sh
@@ -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;;