parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-29 19:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pollutants: merge conflicts

Browse Source
This commit is contained in:
Dylan Jeannin committed 2026-06-22 10:42:29 +02:00
1 parent ffd95b9fdf
commit 1d1a00a0ff
1 file changed
-3
Download Patch File Download Diff File Expand all files Collapse all files
src/Model/Pollutants/Pollutants.py
-3
View File
@@ -374,7 +374,6 @@ class Pollutants(SQLSubModel):
cls._db_create(execute) cls._db_create(execute)
created = True created = True
<<<<<<< HEAD
if major == "0" and int(minor) < 2: if major == "0" and int(minor) < 2:
if not created: if not created:
cls._db_update_to_0_2_0(execute, data) 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) # cls._db_update_to_0_2_5(execute, data)
# # created = True # # created = True
=======
>>>>>>> origin/scenarios
if not created: if not created:
return cls._update_submodel(execute, version, data) return cls._update_submodel(execute, version, data)