On 2015-04-22 06:12, Matthew Schinkel wrote:

There are some weird lines in CHANGELOG. Please take a look.

<<<<<<< HEAD
=======
 - Added blink-a-led samples for ne device files.
>>>>>>> 6cccc7a21d70c806f73379d0718d67919b8d2f5c


As far as I can see I just repaired that yesterday!

Regards, Rob.

--
*Rob H*amerling - http://www.robh.nl

--
You received this message because you are subscribed to the Google Groups 
"jallib" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/jallib.
For more options, visit https://groups.google.com/d/optout.

Reply via email to