Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflict Markers On Gemfile #3

Closed
ammezie opened this issue Jun 28, 2016 · 0 comments
Closed

Conflict Markers On Gemfile #3

ammezie opened this issue Jun 28, 2016 · 0 comments

Comments

@ammezie
Copy link
Collaborator

ammezie commented Jun 28, 2016 •
edited
Loading

Did bundle install to install the gem as directed by the readme but I got errors and noticed that conflict markers are in the Gemfile.

[!] There was an error parsing Gemfile: syntax error, unexpected <<, expecting end-of-input - <<<<<<< 7e67adb
^. Bundler cannot continue.

from /home/mezie/workspace/ruby/disease-info/Gemfile:3

-------------------------------------------

<<<<<<< 7e67adb

# Bundle gems for development with the command below.

-------------------------------------------
@ammezie ammezie closed this as completed Jun 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@ammezie