From d59ebaf0052a2add0e71d12bd7f28fdc6fdde3a6 Mon Sep 17 00:00:00 2001 From: trevor Date: Sat, 28 Dec 2024 17:47:38 +0900 Subject: [PATCH] migration merger issues fix --- .../migrations/0003_remove_pmsconfiguration_hotels.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py b/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py index 66cc49ce..39457bda 100644 --- a/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py +++ b/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py @@ -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 ->>>>>>> zorn-dev from django.db import migrations