From ad6dd0f26a31143b9e000e0fe31c4d6d81780206 Mon Sep 17 00:00:00 2001
From: Venkat Malladi <venkat.malladi@utsouthwestern.edu>
Date: Fri, 17 Apr 2020 08:08:29 -0500
Subject: [PATCH] remove merge conlfict lines.
---
workflow/scripts/plot_profile.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/workflow/scripts/plot_profile.sh b/workflow/scripts/plot_profile.sh
index 801c205..34bf24e 100755
--- 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;;
--
GitLab