json lesson contains conflict markers

IsaKiko / D3-visualising-data

Lesson plans for teaching the basics of HTML, CSS, SVG, JSON, and JS (primarily D3.js), in order to create browser-based data visualisations.

http://isakiko.github.io/D3-visualising-data/

Other

35 stars 35 forks source link

Closed twitwi closed 9 years ago

twitwi commented 9 years ago

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

<<<<<<< HEAD This process is called 'nesting'.

IsaKiko commented 9 years ago

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 commented 9 years ago

done :)