Fixing matplotlib future warnings
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 33
− 25
@@ -21,7 +21,6 @@ from ..plots.plot_beams import *
@@ -42,7 +41,8 @@ def fig_folder(dirname):
@@ -56,6 +56,7 @@ class Plot(object):
@@ -67,7 +68,10 @@ class Plot(object):
@@ -192,9 +196,12 @@ class Plot(object):
@@ -211,16 +218,17 @@ class Plot(object):
@@ -228,60 +236,60 @@ class Plot(object):