fix(merge): fixed merge conflict after popping local changes back in from stash

2026-04-03 13:01:05 +02:00 · 2026-04-03 13:01:05 +02:00 · 24da8948c5
commit 24da8948c5
parent 1cb0e2d95b
3 changed files with 31 additions and 16 deletions
--- a/experiments/plots/plot.py
+++ b/experiments/plots/plot.py
@ -6,6 +6,7 @@ def simple_plot(x: list, y: list, show_window: bool = False, filename: str = "pl
    plt.savefig(filename)

    if show_window:
+        # blocks until window is closed
        plt.show()

    plt.close()