SmartSolTech/Touchh
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

migration merger issues fix

Browse Source
This commit is contained in:
trevor
2024-12-28 17:47:38 +09:00
parent 31cf30e344
commit d59ebaf005
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py
View File

@@ -1,8 +1,4 @@
<<<<<<< HEAD
# Generated by Django 5.1.4 on 2024-12-25 07:00
=======
# Generated by Django 5.1.4 on 2024-12-28 00:49 # Generated by Django 5.1.4 on 2024-12-28 00:49
>>>>>>> zorn-dev
from django.db import migrations from django.db import migrations