小编Ill*_*har的帖子

我尝试启动我的localhost:3000 RoR应用程序.终端发生的事情:

[omrails]$rails s
Gemfile syntax error:
<<<<<<< HEAD
^

我尝试在Google和Stackoverflow上搜索,但没有发现任何类似于我的问题.我假设ny Gemfile有问题,但我不知道究竟是什么.

我的Gemfile看起来像这样:

source 'https://rubygems.org'

gem 'rails', '3.2.8'
gem 'bootstrap-sass'
gem 'devise'
gem 'omniauth'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'


group :development do
gem 'sqlite3'
end


# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails',   '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby …