SparkFun Forums 

Where electronics enthusiasts find answers.

Questions relating to designing PCBs
By brmarcum
In the Using EAGLE: Schematic tutorial, I'm supposed to add a 5mm LED to the BareBonesArduino tutorial project. When I go to add it, I get this error:
Loading C:/Users/brand/Documents/eagle/SparkFun-Eagle-Libraries-master/SparkFun-LED.lbr ...


line 2049, column 2: Unexpected '<'.
Looking at the source code at lines 2047-51, I see:
Code: Select all
2047: <circle x="-2.28975" y="1.8615" radius="0.254" width="0" layer="21"/>
2048: </package>
2049: <<<<<<< HEAD
2050: <package name="APA102">
2051: <smd name="2" x="-2.1" y="0" dx="1.2" dy="1" layer="1"/>
I've found this same bit of code you see on line 2049 elsewhere in the file. I can't add LEDs because of this line, but maybe the other instances of this line would crash it as well. I tried to remove it and, no surprise, that didn't help. It doesn't appear to be a tag since the other lines with the word "HEAD" are in the same format and I don't see a closing "HEAD" tag anywhere in the file.

Any ideas?