bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: handle overlooked merge conflict

Browse Source
This commit is contained in:
Fabian Neumann 2023-03-06 09:45:28 +01:00
parent 3198115c04
commit 9dbeea17ec
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/plot_summary.py
View File

@ -437,17 +437,6 @@ def plot_carbon_budget_distribution(input_eurostat):
Plot historical carbon emissions in the EU and decarbonization path. Plot historical carbon emissions in the EU and decarbonization path.
""" """
<<<<<<< HEAD
import seaborn as sns; sns.set()
sns.set_style('ticks')
plt.style.use('seaborn-ticks')
plt.rcParams['xtick.direction'] = 'in'
plt.rcParams['ytick.direction'] = 'in'
plt.rcParams['xtick.labelsize'] = 20
plt.rcParams['ytick.labelsize'] = 20
=======
import matplotlib.gridspec as gridspec
import seaborn as sns import seaborn as sns
sns.set() sns.set()
@ -457,7 +446,6 @@ def plot_carbon_budget_distribution(input_eurostat):
plt.rcParams["ytick.direction"] = "in" plt.rcParams["ytick.direction"] = "in"
plt.rcParams["xtick.labelsize"] = 20 plt.rcParams["xtick.labelsize"] = 20
plt.rcParams["ytick.labelsize"] = 20 plt.rcParams["ytick.labelsize"] = 20
>>>>>>> 13769f90af4500948b0376d57df4cceaa13e78b5
plt.figure(figsize=(10, 7)) plt.figure(figsize=(10, 7))
gs1 = gridspec.GridSpec(1, 1) gs1 = gridspec.GridSpec(1, 1)