projects / oweals / finalsclub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d315a33 65b5f91)
resolved index.html conflict in head
authorec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)
committerec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)
1  2 
public/index.html patch | diff1 | diff2 | blob | history
public/javascripts/main.js patch | diff1 | diff2 | blob | history

diff --cc public/index.html
index 60cdacb3292e5794436b629c99b3ab099a4bb487,fe78b539bb09fc8d2bbdde2890073a332cfb79e7..e6a2e7112b8c1387fe03e839a3ac18d4548ea33c
--- 1/public/index.html
--- 2/public/index.html
+++ b/public/index.html
@@@ -3,9 -3,11 +3,12 @@@
  
        <head>
                
-               <link rel="stylesheet" href="assets/css/include.css" type="text/css" media="screen" />
-               <script type="text/javascript" src="assets/js/modernizr.custom.js"></script>
-               <script type="text/javascript" src="assets/js/load.js"></script>
+               <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
+               <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
+               <script type="text/javascript" src="/assets/js/load.js"></script>
++
+               <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
+               <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
  
                <script type='text/javascript' src='/javascripts/jquery.min.js'></script>
                <script type='text/javascript' src='/javascripts/es5-shim.min.js'></script>
diff --cc public/javascripts/main.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.