gemfile issues

danashan · Oct 20, 2011 · 60d9210 · 60d9210
1 parent ce3dbb1
commit 60d9210
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,10 +4,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.1.0'
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
@@ -27,10 +24,9 @@ end
 group :development do
 
 gem 'rspec-rails', '2.6.1'
-<<<<<<< HEAD
+
 gem 'annotate', '2.4.1.beta1'
-=======
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
+
 
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,10 +30,7 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
-<<<<<<< HEAD
     annotate (2.4.1.beta1)
-=======
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
     builder (3.0.0)
@@ -110,11 +107,8 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-<<<<<<< HEAD
       tilt (~> 1.1, != 1.3.0)
-=======
-      tilt (!= 1.3.0, ~> 1.1)
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.3)
@@ -134,10 +128,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-<<<<<<< HEAD
   annotate (= 2.4.1.beta1)
-=======
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
   coffee-rails (~> 3.1.0)
   jquery-rails
   json