parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pollutants: merge conflicts

scenarios
Dylan Jeannin 2026-06-22 10:42:29 +02:00
parent ffd95b9fdf
commit 1d1a00a0ff
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Pollutants/Pollutants.py
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)