migration conflict fix

AkshJain99 · Aug 17, 2018 · c2b099e · c2b099e
1 parent f6be415
commit c2b099e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/mainapp/migrations/0035_merge_20180817_1449.py 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
@@ -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 %}
+{% block nav-global %}{% endblock %}