From d43ee63684c3958dfc754c5f89a607494947d2dc Mon Sep 17 00:00:00 2001
From: 3daddict <print@3daddict.com>
Date: Sun, 14 Jun 2020 13:31:40 -0700
Subject: [PATCH] templat fix

---
 src/template.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/template.html b/src/template.html
index b0f9fe5..19750f0 100644
--- a/src/template.html
+++ b/src/template.html
@@ -9,15 +9,8 @@
 
 	<link rel='manifest' href='manifest.json' crossorigin='use-credentials'>
 	<link rel='icon' type='image/png' href='favicon.png'>
-<<<<<<< HEAD
 	<link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp" rel="stylesheet">
 	<link rel="stylesheet" href="index.css" />
-=======
-	<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500&display=swap" rel="stylesheet">
-	<link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp" rel="stylesheet">
-
-
->>>>>>> dev
 	<!-- Sapper generates a <style> tag containing critical CSS
 	     for the current page. CSS for the rest of the app is
 	     lazily loaded when it precaches secondary pages -->