resolve merge conflict

2023-03-06 09:46:56 +01:00 · 2023-03-06 09:46:56 +01:00 · 604d086016
commit 604d086016
parent 9dbeea17ec d0e0880b19
2 changed files with 2 additions and 4 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -1 +1 @@
-13769f90af4500948b0376d57df4cceaa13e78b5
+13769f90af4500948b0376d57df4cceaa13e78b5
--- a/scripts/plot_summary.py
+++ b/scripts/plot_summary.py
@ -3,13 +3,11 @@ import logging

 logger = logging.getLogger(__name__)

+import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd

-import matplotlib.gridspec as gridspec
-import matplotlib.pyplot as plt
-
 plt.style.use("ggplot")

 from prepare_sector_network import co2_emissions_year