Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Nov 30, 2013
@TonnyXu Merge branch 'master' of https://github.com/imathis/octopress into so…
…urce

Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml
2c35cce
@TonnyXu Merge branch 'source' of github.com:TonnyXu/octopress into source
Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml
0b453f9
Showing with 3 additions and 9 deletions.
  1. +1 −2 Gemfile
  2. +1 −2 Gemfile.lock
  3. +1 −5 _config.yml
View
3 Gemfile
@@ -1,8 +1,7 @@
source "https://rubygems.org"
group :development do
- gem 'rake', '~> 0.9.5'
- gem 'rack', '~> 1.4.1'
+ gem 'rake', '~> 0.9'
gem 'jekyll', '~> 0.12'
gem 'rdiscount', '~> 2.0.7'
gem 'pygments.rb', '~> 0.3.4'
View
3 Gemfile.lock
@@ -58,8 +58,7 @@ DEPENDENCIES
jekyll (~> 0.12)
liquid (~> 2.3.0)
pygments.rb (~> 0.3.4)
- rack (~> 1.4.1)
- rake (~> 0.9.5)
+ rake (~> 0.9)
rb-fsevent (~> 0.9)
rdiscount (~> 2.0.7)
rubypants (~> 0.2.0)
View
6 _config.yml
@@ -50,7 +50,7 @@ titlecase: true # Converts page and post titles to titlecase
# list each of the sidebar modules you want to include, in the order you want them to appear.
# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
-default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+default_asides: [asides/recent_posts.html, asides/github.html, asides/twitter.html]
# Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below
# and add an array with the asides you want to use.
@@ -69,15 +69,11 @@ github_show_profile_link: true
github_skip_forks: true
# Twitter
-<<<<<<< HEAD
twitter_user: TonnyXu
twitter_tweet_count: 5
twitter_show_replies: false
twitter_follow_button: true
twitter_show_follower_count: false
-=======
-twitter_user:
->>>>>>> master
twitter_tweet_button: true
# Google +1

No commit comments for this range

Something went wrong with that request. Please try again.