Corrigindo conflito

7b9af9b1 · Isaias Santana · d6baa2e8 · 7b9af9b1
Commit 7b9af9b1 authored Jan 17, 2018 by Isaias Santana
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

src/backend/core/models.py src/backend/core/models.py +1 -5

No files found.
--- a/src/backend/core/models.py
+++ b/src/backend/core/models.py
@@ -24,9 +24,5 @@ class Cliente(models.Model):

    def __str__(self):
        """String representation of Cliente."""
-<<<<<<< HEAD
-        return self.domain_name
-
-=======
        return f'{self.nome.title()} - {self.domain_name}.{settings.BASE_DOMAIN}'
->>>>>>> fd8398fe8333e26759b13a6e604d870fbe0e7995
+