Corrigindo conflito

config/requirements/dev.pip

+blessings==1.6.1
+bpython==0.17
+certifi==2017.11.5
+chardet==3.0.4
 click==6.7
+curtsies==0.2.11
 dj-database-url==0.4.2
 Django==2.0.1
+greenlet==0.4.12
+idna==2.6
+psycopg2==2.7.3.2
+Pygments==2.2.0
 python-decouple==3.1
 python-dotenv==0.7.1
 pytz==2017.3
+requests==2.18.4
+six==1.11.0
+Unipath==1.1
+urllib3==1.22
+wcwidth==0.1.7

src/backend/core/admin.py

 from django.contrib import admin
 
+from django.utils.translation import ugettext_lazy as _
+
 from .models import Cliente
 
+from django.conf import settings
+
+
+admin.site.site_tile = _(settings.SITE_TITLE)
+admin.site.site_header = _(settings.SITE_HEADER)
+
 admin.site.register(Cliente)

src/backend/core/migrations/0001_initial.py

-# Generated by Django 2.0.1 on 2018-01-15 17:32
+# Generated by Django 2.0.1 on 2018-01-17 10:05
 
 from django.db import migrations, models
 
@@ -15,7 +15,12 @@ class Migration(migrations.Migration):
             name='Cliente',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('domain_name', models.CharField(max_length=50)),
+                ('nome', models.CharField(max_length=50)),
+                ('domain_name', models.CharField(max_length=50, unique=True)),
+                ('email', models.EmailField(max_length=70)),
+                ('username', models.CharField(max_length=50)),
+                ('password', models.CharField(max_length=50)),
+                ('droplet_id', models.CharField(blank=True, max_length=50, null=True)),
             ],
             options={
                 'verbose_name': 'Cliente',

src/backend/core/migrations/0002_auto_20180116_1134.py

-# Generated by Django 2.0.1 on 2018-01-16 11:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cliente',
-            name='email',
-            field=models.EmailField(default='isaiassantan301@gmail.com', max_length=70),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='cliente',
-            name='password',
-            field=models.CharField(default='123456', max_length=20),
-            preserve_default=False,
-        ),
-    ]

src/backend/core/models.py

 from django.db import models
 
-# Create your models here.
+from django.conf import settings
+
 
 class Cliente(models.Model):
     """Model definition for Cliente."""
 
-    domain_name = models.CharField(max_length=50)
+    # Informações do cliente
+    nome = models.CharField(max_length=50)
+    domain_name = models.CharField(max_length=50, unique=True)
     email = models.EmailField(max_length=70)
-    password = models.CharField(max_length=20)
+    username = models.CharField(max_length=50)
+    password = models.CharField(max_length=50)
+
+    # Informações do droplet
+    droplet_id = models.CharField(max_length=50, blank=True, null=True)
 
     class Meta:
         """Meta definition for Cliente."""
@@ -17,5 +24,9 @@ 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

src/settings/base.py

@@ -4,7 +4,17 @@ from dj_database_url import parse as db_url
 
 from unipath import Path
 
+# Title of admin site
+SITE_TITLE = config('SITE_TITLE', default='Administração Infatec')
 
+# Header os admin site
+SITE_HEADER = config('SITE_HEADER', default='Administração Infatec')
+
+# Base Domain
+BASE_DOMAIN = config('BASE_DOMAIN', default='diariodigital.pege.com.br')
+
+
+# Base directory of projetc
 BASE_DIR = Path(__file__).ancestor(2)
 
 DEBUG = config('DEBUG', default=False, cast=bool)