Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Resolve conflict on Gemfile.lock

  • Loading branch information...
commit 1abb5d0e7dfefa42c3f215b06971bb7345599136 1 parent c28f00f
Prem Sichanugrist authored June 10, 2011

Showing 1 changed file with 32 additions and 31 deletions. Show diff stats Hide diff stats

  1. 63  Gemfile.lock
63  Gemfile.lock
@@ -8,12 +8,12 @@ GEM
8 8
   remote: http://rubygems.org/
9 9
   specs:
10 10
     abstract (1.0.0)
11  
-    actionmailer (3.0.7)
12  
-      actionpack (= 3.0.7)
13  
-      mail (~> 2.2.15)
14  
-    actionpack (3.0.7)
15  
-      activemodel (= 3.0.7)
16  
-      activesupport (= 3.0.7)
  11
+    actionmailer (3.0.8)
  12
+      actionpack (= 3.0.8)
  13
+      mail (~> 2.2.19)
  14
+    actionpack (3.0.8)
  15
+      activemodel (= 3.0.8)
  16
+      activesupport (= 3.0.8)
17 17
       builder (~> 2.1.2)
18 18
       erubis (~> 2.6.6)
19 19
       i18n (~> 0.5.0)
@@ -21,19 +21,19 @@ GEM
21 21
       rack-mount (~> 0.6.14)
22 22
       rack-test (~> 0.5.7)
23 23
       tzinfo (~> 0.3.23)
24  
-    activemodel (3.0.7)
25  
-      activesupport (= 3.0.7)
  24
+    activemodel (3.0.8)
  25
+      activesupport (= 3.0.8)
26 26
       builder (~> 2.1.2)
27 27
       i18n (~> 0.5.0)
28  
-    activerecord (3.0.7)
29  
-      activemodel (= 3.0.7)
30  
-      activesupport (= 3.0.7)
31  
-      arel (~> 2.0.2)
  28
+    activerecord (3.0.8)
  29
+      activemodel (= 3.0.8)
  30
+      activesupport (= 3.0.8)
  31
+      arel (~> 2.0.10)
32 32
       tzinfo (~> 0.3.23)
33  
-    activeresource (3.0.7)
34  
-      activemodel (= 3.0.7)
35  
-      activesupport (= 3.0.7)
36  
-    activesupport (3.0.7)
  33
+    activeresource (3.0.8)
  34
+      activemodel (= 3.0.8)
  35
+      activesupport (= 3.0.8)
  36
+    activesupport (3.0.8)
37 37
     appraisal (0.3.5)
38 38
       aruba (~> 0.3.6)
39 39
       bundler
@@ -89,17 +89,17 @@ GEM
89 89
       rack (>= 1.0.0)
90 90
     rack-test (0.5.7)
91 91
       rack (>= 1.0)
92  
-    rails (3.0.7)
93  
-      actionmailer (= 3.0.7)
94  
-      actionpack (= 3.0.7)
95  
-      activerecord (= 3.0.7)
96  
-      activeresource (= 3.0.7)
97  
-      activesupport (= 3.0.7)
  92
+    rails (3.0.8)
  93
+      actionmailer (= 3.0.8)
  94
+      actionpack (= 3.0.8)
  95
+      activerecord (= 3.0.8)
  96
+      activeresource (= 3.0.8)
  97
+      activesupport (= 3.0.8)
98 98
       bundler (~> 1.0)
99  
-      railties (= 3.0.7)
100  
-    railties (3.0.7)
101  
-      actionpack (= 3.0.7)
102  
-      activesupport (= 3.0.7)
  99
+      railties (= 3.0.8)
  100
+    railties (3.0.8)
  101
+      actionpack (= 3.0.8)
  102
+      activesupport (= 3.0.8)
103 103
       rake (>= 0.8.7)
104 104
       thor (~> 0.14.4)
105 105
     rake (0.9.2)
@@ -141,10 +141,11 @@ PLATFORMS
141 141
   ruby
142 142
 
143 143
 DEPENDENCIES
144  
-  aruba
145  
-  cucumber
146  
-  rails (= 3.0.7)
147  
-  rake
148  
-  rspec-rails
  144
+  appraisal
  145
+  cucumber-rails (~> 0.5.1)
  146
+  database_cleaner
  147
+  diesel!
  148
+  rails (>= 3.0)
  149
+  rspec-rails (~> 2.6.1)
149 150
   sqlite3-ruby
150 151
   thin

0 notes on commit 1abb5d0

Please sign in to comment.
Something went wrong with that request. Please try again.