From 9dbeea17ecd771b10b4a7f59a3b504098df1dd70 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 6 Mar 2023 09:45:28 +0100 Subject: [PATCH] fix: handle overlooked merge conflict --- scripts/plot_summary.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index c43fd268..ca0f8a7c 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -437,17 +437,6 @@ def plot_carbon_budget_distribution(input_eurostat): 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 sns.set() @@ -457,7 +446,6 @@ def plot_carbon_budget_distribution(input_eurostat): plt.rcParams["ytick.direction"] = "in" plt.rcParams["xtick.labelsize"] = 20 plt.rcParams["ytick.labelsize"] = 20 ->>>>>>> 13769f90af4500948b0376d57df4cceaa13e78b5 plt.figure(figsize=(10, 7)) gs1 = gridspec.GridSpec(1, 1)