fixes

rickyrauch · rickyrauch · commit 69d6ddd31d5f · 2014-09-08T17:45:03.000-03:00
diff --git a/index.html b/index.html
@@ -3,20 +3,15 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
 
     <title>JSON Web Tokens - jwt.io</title>
 
-<<<<<<< HEAD
     <script type="text/javascript" src="//use.typekit.net/iws6ohy.js"></script>
     <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
-=======
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-    <link href="http://fonts.googleapis.com/css?family=Source+Code+Pro:400,500,600|Roboto:400,100,300,500,700" rel="stylesheet" type="text/css">
->>>>>>> 4584aefa52244625f756f00cebe5b93bc72bceab
     <link rel="stylesheet" href="dist/css/app.css" media="all">
 
     <!-- Bootstrap core CSS -->
