From 670cf766c99a8a5de806fd7d6f1d9e357a55071a Mon Sep 17 00:00:00 2001
From: laurawilsonri <laura_wilson@brown.edu>
Date: Mon, 18 Mar 2019 18:29:10 -0400
Subject: not sure

---
 deploy/index.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'deploy')
diff --git a/deploy/index.html b/deploy/index.html
index dbfc6dee0..ca5c13e98 100644
--- a/deploy/index.html
+++ b/deploy/index.html
@@ -2,12 +2,9 @@
 
 <head>
   <title>Dash Web</title>
-<<<<<<< HEAD
   <link href="https://fonts.googleapis.com/css?family=Fjalla+One|Hind+Siliguri:300" rel="stylesheet">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
     integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-=======
->>>>>>> f70ad315167b714f11f7d68f35a46abe9e525a4d
   <script src="https://cdnjs.cloudflare.com/ajax/libs/typescript/3.3.1/typescript.min.js"></script>
 </head>
 
-- 
cgit v1.2.3-70-g09d2

