Skip to content

M
midterm_nicsbabes
Commit 2da19833 authored by Gabriel Geraldo's avatar Gabriel Geraldo
Browse files
Options

fixed stray merge conflict HEAD

parent 458d9613
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
widget_nicsbabes/templates/base.html
View file @ 2da19833
...@@ -2,12 +2,9 @@ ...@@ -2,12 +2,9 @@
<html lang="en"> <html lang="en">
{% load static %} {% load static %}
<head> <head>
<<<<<<< HEAD
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
=======
>>>>>>> dashboardv2
<link rel="stylesheet" href=" {% static '/css/style.css' %}"> <link rel="stylesheet" href=" {% static '/css/style.css' %}">
</head> </head>
<body style ="background-color: #afcaff;" > <body style ="background-color: #afcaff;" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment