Modifications of slurm and parser

parallel_bilby/parser.py

@@ -322,11 +322,7 @@ def _add_slurm_settings_to_parser(parser):
         "--mem-per-cpu",
         type=str,
         default=None,
-<<<<<<< HEAD:src/parser.py
-        help="Memory per CPU",
-=======
         help="Memory per CPU (defaults to None)",
->>>>>>> upstream/master:parallel_bilby/parser.py
     )
     slurm_group.add_argument(
         "--extra-lines",

parallel_bilby/slurm.py

@@ -56,7 +56,7 @@ class BaseNode(object):
             for line in slurm_extra_lines.split():
                 lines.append("#SBATCH {}".format(line))
         lines.append("")
-        if self.args.extra_lines is not None:
+        if self.args.extra_lines:
             for line in self.args.extra_lines.split(";"):
                 lines.append(line.strip())
         lines.append("")