Ah?
This commit is contained in:
parent
c699283bf8
commit
7790bc8c8a
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue