Merge branch 'master' of github.com:jwachira/myttoo

Conflicts: Gemfile
jwachira · Aug 19, 2011 · afa7d7b · afa7d7b
2 parents 02f1822 + 43c45f4
commit afa7d7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,4 @@
-# Helpful note, you need to run 
-# bundle unlock 
-# from the command line before editing this file and
-# bundle lock 
-# after
-
-source 'http://rubygems.org/'
+source "http://rubygems.org"
 
 gem 'rails',              '2.3.8',  :require => nil
 gem 'rack',               '1.1.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,5 +1,5 @@
 GEM
-  remote: http://http//rubygems.org/
+  remote: http://rubygems.org/
   specs:
     actionmailer (2.3.8)
       actionpack (= 2.3.8)