Git garbed the merger from within eclipse

Author: jimboid

Longbow/plugins/schedulers/lsf.py

@@ -120,13 +120,8 @@ def prepare(job):
     if job["email-address"] is not "":
 
         if job["email-flags"] is not "":
-<<<<<<< HEAD
-            
-            jobfile.write("#BSUB " + job["email-flags"] + "\n")
-=======
 
-            jobfile.write("#BSUB " + job["email-flags"])
->>>>>>> refs/heads/issues2-5-12
+            jobfile.write("#BSUB " + job["email-flags"] + "\n")
 
         jobfile.write("#BSUB -u " + job["email-address"] + "\n")
 

Longbow/plugins/schedulers/pbs.py

@@ -156,13 +156,8 @@ def prepare(job):
     if job["email-address"] is not "":
 
         if job["email-flags"] is not "":
-<<<<<<< HEAD
-            
-            jobfile.write("#PBS -m " + job["email-flags"] + "\n")
-=======
 
-            jobfile.write("#PBS -m " + job["email-flags"])
->>>>>>> refs/heads/issues2-5-12
+            jobfile.write("#PBS -m " + job["email-flags"] + "\n")
 
         jobfile.write("#PBS -M " + job["email-address"] + "\n")
 

Longbow/plugins/schedulers/sge.py

@@ -111,13 +111,8 @@ def prepare(job):
     if job["email-address"] is not "":
 
         if job["email-flags"] is not "":
-<<<<<<< HEAD
-            
-            jobfile.write("#$ -m " + job["email-flags"] + "\n")
-=======
 
-            jobfile.write("#$ -m " + job["email-flags"])
->>>>>>> refs/heads/issues2-5-12
+            jobfile.write("#$ -m " + job["email-flags"] + "\n")
 
         jobfile.write("#$ -M " + job["email-address"] + "\n")
 

Longbow/plugins/schedulers/slurm.py

@@ -110,13 +110,8 @@ def prepare(job):
     if job["email-address"] is not "":
 
         if job["email-flags"] is not "":
-<<<<<<< HEAD
-            
-            jobfile.write("#SBATCH --mail-type=" + job["email-flags"] + "\n")
-=======
 
-            jobfile.write("#SBATCH --mail-type=" + job["email-flags"])
->>>>>>> refs/heads/issues2-5-12
+            jobfile.write("#SBATCH --mail-type=" + job["email-flags"] + "\n")
 
         jobfile.write("#SBATCH --mail-user=" + job["email-address"] + "\n")
 

Longbow/plugins/schedulers/soge.py

@@ -113,13 +113,8 @@ def prepare(job):
     if job["email-address"] is not "":
 
         if job["email-flags"] is not "":
-<<<<<<< HEAD
-            
-            jobfile.write("#$ -m " + job["email-flags"] + "\n")
-=======
 
-            jobfile.write("#$ -m " + job["email-flags"])
->>>>>>> refs/heads/issues2-5-12
+            jobfile.write("#$ -m " + job["email-flags"] + "\n")
 
         jobfile.write("#$ -M " + job["email-address"] + "\n")