From 1d1a00a0ff6fbf41dee6737a64d1a10e6f7f88cf Mon Sep 17 00:00:00 2001
From: Dylan Jeannin <dylanjeannin@gmail.com>
Date: Mon, 22 Jun 2026 10:42:29 +0200
Subject: [PATCH] Pollutants: merge conflicts

---
 src/Model/Pollutants/Pollutants.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py
index 5169dab9..50b498db 100644
--- a/src/Model/Pollutants/Pollutants.py
+++ b/src/Model/Pollutants/Pollutants.py
@@ -374,7 +374,6 @@ class Pollutants(SQLSubModel):
                 cls._db_create(execute)
                 created = True
 
-<<<<<<< HEAD
         if major == "0" and int(minor) < 2:
             if not created:
                 cls._db_update_to_0_2_0(execute, data)
@@ -387,8 +386,6 @@ class Pollutants(SQLSubModel):
                 # cls._db_update_to_0_2_5(execute, data)
                 # # created = True
 
-=======
->>>>>>> origin/scenarios
         if not created:
             return cls._update_submodel(execute, version, data)