Fix merge conflicts

lukasmerten · Nov 8, 2023 · 1b97602 · 1b97602
2 parents 3d190ba + 11a10eb
commit 1b97602
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/photonField.py b/photonField.py
@@ -728,7 +728,6 @@ def getEmax(self, z=0):
     y10lo = c * EBL_Saldana21('lower').getDensity(eps)
     y10up = c * EBL_Saldana21('upper').getDensity(eps)
 
-
     figure()
     plot(x, y1, label='Kneiske 2004')
     plot(x, y3, label='Stecker 2005')
@@ -740,7 +739,6 @@ def getEmax(self, z=0):
     fill_between(x, y9lo, y9up, facecolor='g', edgecolor='none', alpha=0.2, zorder=-1, label='Stecker 2016 (limits)')
     fill_between(x, y10lo, y10up, facecolor='b', edgecolor='none', alpha=0.2, zorder=-1, label='Saldana 2021 (limits)')
 
-
     legend(loc='lower center', fontsize='x-small')
     loglog()
     grid()