varun-r-mallya/wona.github.com
1
0
Fork 0
mirror of https://github.com/WatchOutNewsAgency/wona.github.com.git synced 2026-01-01 01:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server

Browse Source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Brandon Mathis
2011-09-08 10:31:36 -05:00
parent a289c90909 423e8ecbda
commit 71ad7185bc
3 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile.lock
View File

@ -39,9 +39,17 @@ GEM
rubypython (0.5.1)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
<<<<<<< HEAD
sass (3.1.7)
=======
sass (3.1.5)
sinatra (1.2.6)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
>>>>>>> 423e8ecbda0394d4c77e2ea659768a8f30c35018
stringex (1.3.0)
syntax (1.0.0)
tilt (1.3.2)
PLATFORMS
ruby
@ -57,4 +65,5 @@ DEPENDENCIES
rb-fsevent
rdiscount
rubypants
sinatra (= 1.2.6)
stringex