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

json lesson contains conflict markers #16

Closed
twitwi opened this issue Jul 23, 2015 · 2 comments
Closed

json lesson contains conflict markers #16

twitwi opened this issue Jul 23, 2015 · 2 comments

Comments

@twitwi
Copy link
Contributor

twitwi commented Jul 23, 2015

The current md and html version of the 06-json lesson contains some git conflict markers like

<<<<<<< HEAD This process is called 'nesting'.
@IsaKiko
Copy link
Owner

IsaKiko commented Jul 23, 2015

Hi @twitwi!

Thank you so much for taking the time to review the lessons! Not just this issue, but also all the PR I just merged.

And I'll take care of the conflict markers! :)

IsaKiko added a commit that referenced this issue Jul 23, 2015
@IsaKiko
ran make preview
d8b588a 
Fixes for the issues #10, #11, #12, #15, #16
@IsaKiko
Copy link
Owner

IsaKiko commented Jul 23, 2015

done :)

@IsaKiko IsaKiko closed this as completed Jul 23, 2015
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
2 participants
@twitwi @IsaKiko