diff --git a/fast-image-switcher/index.html b/fast-image-switcher/index.html index 03de960..7f13869 100644 --- a/fast-image-switcher/index.html +++ b/fast-image-switcher/index.html @@ -1,3 +1,13 @@ +<<<<<<< HEAD + + +======= position:absolute; height: 150px; width: 200px; @@ -34,17 +56,27 @@ } +>>>>>>> master +something here +======= }); }); +>>>>>>> master

super fast image switch

@@ -79,4 +119,7 @@ +<<<<<<< HEAD +======= +>>>>>>> master diff --git a/twitter-search/index.html b/twitter-search/index.html index c2b1d93..ac2d5fb 100644 --- a/twitter-search/index.html +++ b/twitter-search/index.html @@ -96,7 +96,7 @@ success: function(data){ $.each(data.results, function(index, tweet){ $tweets = $(".tweet").first().clone(); - console.log(tweet); + //console.log(tweet); $tweets.find('.img').attr('src', tweet.profile_image_url) $tweets.find('.name').text(tweet.from_user_name); $tweets.find('.handle').html(twttr.txt.autoLink("@"+tweet.from_user));