Permalink
Browse files

Fix merge-conflict.

  • Loading branch information...
Robert Jackson
Robert Jackson committed Apr 6, 2012
2 parents 6ab0f4a + 9ae9f71 commit d55975457af66ad34080f781efe855f9b93f893d
Showing with 11 additions and 1 deletion.
  1. +1 −1 Rakefile
  2. +1 −0 index.html
  3. +9 −0 lib/javascripts/ga.js
View
@@ -28,7 +28,7 @@ namespace :pivot do
end
desc "Generates demo CSV for pivot.js gh-pages."
- task :generate_csv do
+ task :csv do
dcsv = DemoCSV.new(1000)
dcsv.to_file "./lib/csv/demo.csv"
$stdout.puts "Generate demo CSV successful"
View
@@ -9,6 +9,7 @@
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="./lib/javascripts/subnav.js"></script>
<script type="text/javascript" src="./lib/javascripts/accounting.min.js"></script>
+ <script type="text/javascript" src="./lib/javascripts/ga.js"></script>
<!-- jquery_pivot must be loaded after pivot.js and jQuery -->
<script type="text/javascript" src="./pivot.min.js"></script>
View
@@ -0,0 +1,9 @@
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-30605854-1']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();

0 comments on commit d559754

Please sign in to comment.