From c2b099ef5b0ad21d83637238c205ea4755a56a4a Mon Sep 17 00:00:00 2001
From: Biswas B <Biswasb007@gmail.com>
Date: Fri, 17 Aug 2018 14:49:45 +0530
Subject: [PATCH] migration conflict fix

---
 mainapp/migrations/0035_merge_20180817_1449.py | 14 ++++++++++++++
 templates/admin/base_site.html                 |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 mainapp/migrations/0035_merge_20180817_1449.py

diff --git a/mainapp/migrations/0035_merge_20180817_1449.py b/mainapp/migrations/0035_merge_20180817_1449.py
new file mode 100644
index 000000000..9d4b50cc9
--- /dev/null
+++ b/mainapp/migrations/0035_merge_20180817_1449.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1 on 2018-08-17 09:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0034_auto_20180817_1206'),
+        ('mainapp', '0034_auto_20180817_1337'),
+    ]
+
+    operations = [
+    ]
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
index c245abb95..d19a083f0 100644
--- a/templates/admin/base_site.html
+++ b/templates/admin/base_site.html
@@ -1,12 +1,12 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title }} | {% trans 'Toast Driven Admin' %}{% endblock %}
+{% block title %}{{ title }} | {% trans 'Admin' %}{% endblock %}
 
 {% block branding %}
 <div>
-<h1 id="site-name">KeralaRescue Dashboard <a style="font-size: 50%" href="/dmodash">Statistics</a> </h1>  
+<h1 id="site-name">KeralaRescue Dashboard <a style="font-size: 50%" href="/dmodash">Statistics</a> </h1>
 </div>
 {% endblock %}
 
-{% block nav-global %}{% endblock %}
\ No newline at end of file
+{% block nav-global %}{% endblock %}