From 7790bc8c8a2f371b32cbf86b721fca2395b3e86c Mon Sep 17 00:00:00 2001 From: Nika Zhenya Date: Thu, 17 Nov 2022 15:42:55 -0800 Subject: [PATCH] Ah? --- source/main/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/main/models.py b/source/main/models.py index 1df2109..c19d76c 100644 --- a/source/main/models.py +++ b/source/main/models.py @@ -214,6 +214,7 @@ class MovieQuerySet(models.QuerySet): def fix_path(self, el): if settings.DEBUG: return settings.URL_DEBUG.format(el) +<<<<<<< HEAD else: return settings.MEDIA_ROOT / el @@ -314,6 +315,8 @@ class MovieQuerySet(models.QuerySet): def fix_path(self, el): if settings.DEBUG: return settings.URL_CDN.format(el) +======= +>>>>>>> 3567a78 (Eliminación de conflictos) else: return settings.MEDIA_ROOT / el