Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix conflict

  • Loading branch information...
commit 8486768b2d1e91366b670c1b9458dcf9e41e29e4 2 parents ba657fd + c83ba48
@rociiu rociiu authored
Showing with 3 additions and 2 deletions.
  1. +1 −0  .gitignore
  2. +1 −1  Gemfile
  3. +1 −1  Gemfile.lock
View
1  .gitignore
@@ -3,3 +3,4 @@ db/*.sqlite3
log/*.log
tmp/
.DS_Store
+coverage/
View
2  Gemfile
@@ -5,7 +5,7 @@ gem 'httparty'
gem 'kaminari'
-gem 'omniauth'
+gem 'omniauth', '>=0.2.6'
gem 'jquery-rails', '>= 0.2.6'
View
2  Gemfile.lock
@@ -170,7 +170,7 @@ DEPENDENCIES
httparty
jquery-rails (>= 0.2.6)
kaminari
- omniauth
+ omniauth (>= 0.2.6)
pg
rails (= 3.0.5)
rcov
Please sign in to comment.
Something went wrong with that request. Please try again.