diff options
Diffstat (limited to 'views/header.ejs')
| -rw-r--r-- | views/header.ejs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/views/header.ejs b/views/header.ejs index 74afad9..815be5c 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -11,10 +11,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="stylesheet" href="/css/bootstrap.css" /> <link rel="stylesheet" href="/css/bootstrap-responsive.css"> -<<<<<<< HEAD - <link rel="stylesheet" href="/css/styles.css" /> - <link rel="stylesheet" href="/css/use.css" /> -======= + <link rel="stylesheet" href="/css/shame.css" /> ->>>>>>> 44b7b0b25befea64ab85d7da8eb93aa905c76e08 |