Implementing simpler portfolio. Now it's actually possible to get 100…

…% on PS Insights
cameronwp · Jun 21, 2014 · fabf54a · fabf54a
2 parents 6c05c85 + f6bd15c
commit fabf54a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content=" FILL ME IN ">
     <meta name="author" content=" FILL ME IN ">
-    <title>Cameron Pitman: Portfolio</title>
+    <title>Cameron Pittman: Portfolio</title>
 
     <!-- Hmm, what is the impact of web fonts on speed? Measure it... -->
     <!-- <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet"> -->

diff --git a/project-2048.html b/project-2048.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content=" FILL ME IN ">
     <meta name="author" content=" FILL ME IN ">
-    <title>Cameron Pitman: Portfolio</title>
+    <title>Cameron Pittman: Portfolio</title>
 
     <!-- Hmm, what is the impact of web fonts on speed? Measure it... -->
     <!-- <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet"> -->
@@ -21,8 +21,13 @@
       ga('create', 'UA-XXXX-Y');
       ga('send', 'pageview');
     </script>
+<<<<<<< HEAD
     <script src="http://www.google-analytics.com/analytics.js"></script>
     <script async src="js/perfmatters.js"></script>
+=======
+    <script src="//www.google-analytics.com/analytics.js"></script>
+    <script src="js/perfmatters.js"></script>
+>>>>>>> f6bd15c5805d7c533f184130bd4c95826094f639
   </head>
 
   <body>