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

README.md file contain merging conflict code #28

Open
labsterx opened this issue Dec 17, 2014 · 1 comment
Open

README.md file contain merging conflict code #28

labsterx opened this issue Dec 17, 2014 · 1 comment
Assignees
@jonniespratley
Milestone
1.0.0

Comments

@labsterx
Copy link

In the README.md file, there're characters that might be resulted from merging conflicts:

Line 80: <<<<<<< HEAD

Line 86: ======= $ sh ./bin/db.sh >>>>>>> fe4af0e
@jonniespratley
Copy link
Owner

I will fix this, thanks

@jonniespratley jonniespratley added this to the 1.0.0 milestone Dec 17, 2014
@jonniespratley jonniespratley self-assigned this Dec 17, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@jonniespratley jonniespratley

Labels
None yet
Projects
None yet
Milestone
1.0.0
Development

No branches or pull requests
2 participants
@jonniespratley @labsterx