Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

resolved confrict

  • Loading branch information...
commit 1b1328c553eb7934863619bde63e9d1a4bd248be 1 parent 0e9b3ee
teppei machida authored
View
5 Gemfile
@@ -45,7 +45,10 @@ end
group :test do
gem 'capybara', '1.1.2'
- gem 'rb-fsevent', '0.4.3.1', require: false
+ gem 'rb-fsevent',
+ :git => 'git://github.com/ttilley/rb-fsevent.git',
+ :branch => 'pre-compiled-gem-one-off',
+ :require => false
gem 'growl', '1.0.3'
gem 'factory_girl_rails', '1.4.0'
gem 'cucumber-rails', '1.2.1', require: false
View
10 Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+ remote: git://github.com/ttilley/rb-fsevent.git
+ revision: f36a8cd01b49a6ce2a26d9e1083b5f6e6722c470
+ branch: pre-compiled-gem-one-off
+ specs:
+ rb-fsevent (0.4.3.1pre1)
+
GEM
remote: https://rubygems.org/
specs:
@@ -148,7 +155,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rb-fsevent (0.4.3.1)
rdoc (3.12)
json (~> 1.4)
rmagick (2.13.1)
@@ -224,7 +230,7 @@ DEPENDENCIES
jquery-rails
pg
rails (= 3.2.3)
- rb-fsevent (= 0.4.3.1)
+ rb-fsevent!
rmagick
rspec-rails (= 2.10.0)
sass-rails (~> 3.2.3)
View
1  app/assets/stylesheets/sass/parties.css.sass
@@ -273,7 +273,6 @@ body.parties_show
font-size: 13px
line-height: 1.6
->>>>>>> 3a87896a141829a5ffa448b42fb14071609b7eec
.backlog
clear: both
+clearfix
Please sign in to comment.
Something went wrong with that request. Please try again.