From 1bd83b008f824b1ff39d921a0da458322d3d7bb8 Mon Sep 17 00:00:00 2001
From: Manos Katsomallos <manos@delkappa.com>
Date: Fri, 15 Oct 2021 14:44:33 +0200
Subject: [PATCH] Resolved conflicts

---
 code/expt/dist_cor.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/expt/dist_cor.py b/code/expt/dist_cor.py
index 225b518..9896ec7 100644
--- a/code/expt/dist_cor.py
+++ b/code/expt/dist_cor.py
@@ -94,16 +94,6 @@ def main(args):
     print(' [OK]', flush=True)
 
 
-<<<<<<< HEAD
-'''
-  Parse arguments.
-
-  Optional:
-    iter - The number of iterations.
-    time - The time limit of the sequence.
-'''
-=======
->>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
 def parse_args():
   '''
     Parse arguments.
@@ -118,11 +108,7 @@ def parse_args():
   # Mandatory arguments.
 
   # Optional arguments.
-<<<<<<< HEAD
-  parser.add_argument('-i', '--iter', help='The number of iterations.', type=int, default=1)
-=======
   parser.add_argument('-i', '--iter', help='The number of repetitions.', type=int, default=1)
->>>>>>> c41503ed41d8a9bd773425e9d430d4468ff45b92
   parser.add_argument('-t', '--time', help='The time limit of the sequence.', type=int, default=100)
 
   # Parse arguments.