[bug] migration 머지 에러

ZinYan · ZinYan · commit 16fbacd535ab · 2025-08-17T13:34:39.000+09:00
diff --git a/moodico/products/migrations/0011_delete_productvote.py b/moodico/products/migrations/0011_delete_productvote.py
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-# Generated by Django 5.2.4 on 2025-08-17 03:44
-=======
 # Generated by Django 5.2.4 on 2025-08-17 02:56
->>>>>>> a3f16f12cb8cafbfab5ff80a44f7486af32ca3b5
-
 from django.db import migrations
 
 
