From 1a5611c5aa983c90d572c87596231044f2e234bf Mon Sep 17 00:00:00 2001
From: 5shekel <yair99@gmail.com>
Date: Tue, 7 Apr 2015 11:39:48 +0300
Subject: [PATCH] fixed attami.lbr , taken correct attami template from
 high-voltage-programmer schema

---
 ATtami.lbr | 167 ++++++++++++++++++-----------------------------------
 1 file changed, 55 insertions(+), 112 deletions(-)

diff --git a/ATtami.lbr b/ATtami.lbr
index 8087b59..1bdf735 100644
--- a/ATtami.lbr
+++ b/ATtami.lbr
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="7.2.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<<<<<<< HEAD
-<grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
-=======
 <grid distance="0.05" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
->>>>>>> master
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -41,14 +37,14 @@
 <layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
-<layer number="44" name="Drills" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="yes"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="1" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="7" fill="1" visible="no" active="no"/>
@@ -63,7 +59,7 @@
 <layer number="96" name="Values" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="97" name="Info" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="98" name="Guide" color="6" fill="1" visible="yes" active="yes"/>
-<layer number="99" name="SpiceOrder" color="7" fill="1" visible="no" active="no"/>
+<layer number="99" name="SpiceOrder" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="100" name="Muster" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="101" name="Patch_Top" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="102" name="Vscore" color="7" fill="1" visible="yes" active="yes"/>
@@ -77,7 +73,7 @@
 <layer number="110" name="110" color="7" fill="1" visible="no" active="no"/>
 <layer number="111" name="111" color="7" fill="1" visible="no" active="no"/>
 <layer number="112" name="tSilk" color="7" fill="1" visible="no" active="no"/>
-<layer number="113" name="ReferenceLS" color="7" fill="1" visible="no" active="no"/>
+<layer number="113" name="IDFDebug" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="116" name="Patch_BOT" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="118" name="Rect_Pads" color="7" fill="1" visible="no" active="no"/>
 <layer number="121" name="_tsilk" color="7" fill="1" visible="yes" active="yes"/>
@@ -91,12 +87,12 @@
 <layer number="131" name="prix" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="132" name="test" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="144" name="Drill_legend" color="7" fill="1" visible="no" active="yes"/>
-<layer number="150" name="Notes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="150" name="Notes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="151" name="HeatSink" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="152" name="_bDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="153" name="FabDoc1" color="6" fill="1" visible="no" active="no"/>
-<layer number="154" name="FabDoc2" color="2" fill="1" visible="no" active="no"/>
-<layer number="155" name="FabDoc3" color="7" fill="15" visible="no" active="no"/>
+<layer number="153" name="FabDoc1" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="154" name="FabDoc2" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="155" name="FabDoc3" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="199" name="Contour" color="7" fill="1" visible="no" active="yes"/>
 <layer number="200" name="200bmp" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="201" name="201bmp" color="7" fill="1" visible="yes" active="yes"/>
@@ -123,9 +119,15 @@
 <layer number="222" name="222bmp" color="23" fill="1" visible="no" active="no"/>
 <layer number="223" name="223bmp" color="24" fill="1" visible="no" active="no"/>
 <layer number="224" name="224bmp" color="25" fill="1" visible="no" active="no"/>
-<layer number="231" name="Eagle3D_PG1" color="7" fill="1" visible="no" active="no"/>
-<layer number="232" name="Eagle3D_PG2" color="7" fill="1" visible="no" active="no"/>
-<layer number="233" name="Eagle3D_PG3" color="7" fill="1" visible="no" active="no"/>
+<layer number="225" name="225bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="226" name="226bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="227" name="227bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="228" name="228bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="229" name="229bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="230" name="230bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="231" name="231bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="232" name="Eagle3D_PG2" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="233" name="Eagle3D_PG3" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="248" name="Housing" color="7" fill="1" visible="no" active="no"/>
 <layer number="249" name="Edge" color="7" fill="1" visible="no" active="no"/>
 <layer number="250" name="Descript" color="7" fill="1" visible="yes" active="yes"/>
@@ -466,7 +468,6 @@
 <text x="-3" y="2" size="0.762" layer="25">&gt;NAME</text>
 <text x="-3" y="-2.7" size="0.762" layer="27">&gt;VALUE</text>
 </package>
-<<<<<<< HEAD
 <package name="SOT89">
 <wire x1="2.2724" y1="1.6104" x2="2.2724" y2="-1.1104" width="0.1778" layer="51"/>
 <wire x1="2.2724" y1="-1.1104" x2="-2.2724" y2="-1.1104" width="0.1778" layer="51"/>
@@ -488,7 +489,7 @@
 <rectangle x1="-0.25" y1="-2.15" x2="0.25" y2="-1.15" layer="51"/>
 <rectangle x1="1.25" y1="-2.15" x2="1.75" y2="-1.15" layer="51"/>
 <rectangle x1="-0.85" y1="1.65" x2="0.85" y2="2.2" layer="51"/>
-=======
+</package>
 <package name="SOIC-8">
 <wire x1="2.4" y1="1.9" x2="2.4" y2="-1.4" width="0.2032" layer="51"/>
 <wire x1="2.4" y1="-1.4" x2="2.4" y2="-1.9" width="0.2032" layer="51"/>
@@ -539,15 +540,13 @@
 <text x="-3.81" y="2.54" size="1.27" layer="25">&gt;NAME</text>
 </package>
 <package name="BREAKOUT_ATTAMI">
+<circle x="2.54" y="20.32" radius="1.75" width="0.127" layer="21"/>
+<circle x="20.32" y="20.32" radius="1.75" width="0.0254" layer="21"/>
+<circle x="3.9878" y="16.9672" radius="0.567959375" width="0.127" layer="21"/>
+<circle x="17.6276" y="2.3368" radius="1.905" width="0.127" layer="21"/>
+<circle x="2.54" y="20.32" radius="1.79605" width="0.0254" layer="21"/>
+<circle x="20.32" y="20.32" radius="1.79605" width="0.127" layer="21"/>
 <wire x1="0.635" y1="0" x2="1.905" y2="0" width="0.2032" layer="51"/>
-<pad name="1.PB5" x="1.27" y="1.27" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="2.PB4" x="1.27" y="3.81" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="3.PB3" x="1.27" y="6.35" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="4.PB2" x="1.27" y="8.89" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="5.PB1" x="1.27" y="11.43" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="6.PB0" x="1.27" y="13.97" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="7.GND" x="1.27" y="16.51" drill="1" diameter="1.6764" rot="R180"/>
-<text x="6.4262" y="23.5712" size="0.8128" layer="25" ratio="18" rot="R180">&gt;NAME</text>
 <rectangle x1="1.016" y1="13.716" x2="1.524" y2="14.224" layer="51" rot="R90"/>
 <rectangle x1="1.016" y1="11.176" x2="1.524" y2="11.684" layer="51" rot="R90"/>
 <rectangle x1="1.016" y1="8.636" x2="1.524" y2="9.144" layer="51" rot="R90"/>
@@ -555,20 +554,22 @@
 <rectangle x1="1.016" y1="3.556" x2="1.524" y2="4.064" layer="51" rot="R90"/>
 <rectangle x1="1.016" y1="1.016" x2="1.524" y2="1.524" layer="51" rot="R90"/>
 <rectangle x1="1.016" y1="16.256" x2="1.524" y2="16.764" layer="51" rot="R90"/>
-<circle x="2.54" y="20.32" radius="1.75" width="0.127" layer="21"/>
-<circle x="20.32" y="20.32" radius="1.75" width="0.0254" layer="21"/>
-<pad name="11.BAT" x="21.59" y="13.97" drill="1" diameter="1.6764"/>
-<pad name="10.GND" x="21.59" y="11.43" drill="1" diameter="1.6764"/>
-<pad name="9.VCC" x="21.59" y="3.81" drill="1" diameter="1.6764"/>
-<pad name="8.GND" x="21.59" y="1.27" drill="1" diameter="1.6764"/>
 <rectangle x1="21.336" y1="3.556" x2="21.844" y2="4.064" layer="51" rot="R270"/>
 <rectangle x1="21.336" y1="11.176" x2="21.844" y2="11.684" layer="51" rot="R270"/>
 <rectangle x1="21.336" y1="13.716" x2="21.844" y2="14.224" layer="51" rot="R270"/>
 <rectangle x1="21.336" y1="1.016" x2="21.844" y2="1.524" layer="51" rot="R270"/>
-<circle x="3.9878" y="16.9672" radius="0.567959375" width="0.127" layer="21"/>
-<circle x="17.6276" y="2.3368" radius="1.905" width="0.127" layer="21"/>
-<circle x="2.54" y="20.32" radius="1.79605" width="0.0254" layer="21"/>
-<circle x="20.32" y="20.32" radius="1.79605" width="0.127" layer="21"/>
+<pad name="1.PB5" x="1.27" y="1.27" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="2.PB4" x="1.27" y="3.81" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="3.PB3" x="1.27" y="6.35" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="4.PB2" x="1.27" y="8.89" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="5.PB1" x="1.27" y="11.43" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="6.PB0" x="1.27" y="13.97" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="7.GND" x="1.27" y="16.51" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="8.GND" x="21.59" y="1.27" drill="1" diameter="1.6764"/>
+<pad name="9.VCC" x="21.59" y="3.81" drill="1" diameter="1.6764"/>
+<pad name="10.GND" x="21.59" y="11.43" drill="1" diameter="1.6764"/>
+<pad name="11.BAT" x="21.59" y="13.97" drill="1" diameter="1.6764"/>
+<text x="6.4262" y="23.5712" size="0.8128" layer="25" ratio="18" rot="R180">&gt;NAME</text>
 <hole x="2.54" y="20.32" drill="3.2"/>
 <hole x="20.32" y="20.32" drill="3.2"/>
 <hole x="17.6276" y="2.3368" drill="2.8"/>
@@ -778,15 +779,9 @@
 <text x="29.4539" y="3.81" size="1.016" layer="21" font="vector">IOr</text>
 </package>
 <package name="BREAKOUT_TAMI_NOHOLES">
+<circle x="-7.4422" y="6.8072" radius="0.567959375" width="0.127" layer="21"/>
+<circle x="6.1976" y="-7.8232" radius="0.567959375" width="0.127" layer="21"/>
 <wire x1="-10.795" y1="-10.16" x2="-9.525" y2="-10.16" width="0.2032" layer="51"/>
-<pad name="1.PB5" x="-10.16" y="-8.89" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="2.PB4" x="-10.16" y="-6.35" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="3.PB3" x="-10.16" y="-3.81" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="4.PB2" x="-10.16" y="-1.27" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="5.PB1" x="-10.16" y="1.27" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="6.PB0" x="-10.16" y="3.81" drill="1" diameter="1.6764" rot="R180"/>
-<pad name="7.GND" x="-10.16" y="6.35" drill="1" diameter="1.6764" rot="R180"/>
-<text x="-3.7338" y="5.7912" size="0.8128" layer="25" ratio="18" rot="R180">&gt;NAME</text>
 <rectangle x1="-10.414" y1="3.556" x2="-9.906" y2="4.064" layer="51" rot="R90"/>
 <rectangle x1="-10.414" y1="1.016" x2="-9.906" y2="1.524" layer="51" rot="R90"/>
 <rectangle x1="-10.414" y1="-1.524" x2="-9.906" y2="-1.016" layer="51" rot="R90"/>
@@ -794,16 +789,22 @@
 <rectangle x1="-10.414" y1="-6.604" x2="-9.906" y2="-6.096" layer="51" rot="R90"/>
 <rectangle x1="-10.414" y1="-9.144" x2="-9.906" y2="-8.636" layer="51" rot="R90"/>
 <rectangle x1="-10.414" y1="6.096" x2="-9.906" y2="6.604" layer="51" rot="R90"/>
-<pad name="11.BAT" x="10.16" y="3.81" drill="1" diameter="1.6764"/>
-<pad name="10.GND" x="10.16" y="1.27" drill="1" diameter="1.6764"/>
-<pad name="9.VCC" x="10.16" y="-6.35" drill="1" diameter="1.6764"/>
-<pad name="8.GND" x="10.16" y="-8.89" drill="1" diameter="1.6764"/>
 <rectangle x1="9.906" y1="-6.604" x2="10.414" y2="-6.096" layer="51" rot="R270"/>
 <rectangle x1="9.906" y1="1.016" x2="10.414" y2="1.524" layer="51" rot="R270"/>
 <rectangle x1="9.906" y1="3.556" x2="10.414" y2="4.064" layer="51" rot="R270"/>
 <rectangle x1="9.906" y1="-9.144" x2="10.414" y2="-8.636" layer="51" rot="R270"/>
-<circle x="-7.4422" y="6.8072" radius="0.567959375" width="0.127" layer="21"/>
-<circle x="6.1976" y="-7.8232" radius="0.567959375" width="0.127" layer="21"/>
+<pad name="1.PB5" x="-10.16" y="-8.89" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="2.PB4" x="-10.16" y="-6.35" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="3.PB3" x="-10.16" y="-3.81" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="4.PB2" x="-10.16" y="-1.27" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="5.PB1" x="-10.16" y="1.27" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="6.PB0" x="-10.16" y="3.81" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="7.GND" x="-10.16" y="6.35" drill="1" diameter="1.6764" rot="R180"/>
+<pad name="8.GND" x="10.16" y="-8.89" drill="1" diameter="1.6764"/>
+<pad name="9.VCC" x="10.16" y="-6.35" drill="1" diameter="1.6764"/>
+<pad name="10.GND" x="10.16" y="1.27" drill="1" diameter="1.6764"/>
+<pad name="11.BAT" x="10.16" y="3.81" drill="1" diameter="1.6764"/>
+<text x="-3.7338" y="5.7912" size="0.8128" layer="25" ratio="18" rot="R180">&gt;NAME</text>
 </package>
 <package name="DIL-24-ZIF">
 <wire x1="-15.24" y1="-1.27" x2="-15.24" y2="-3.048" width="0.2032" layer="21"/>
@@ -850,7 +851,6 @@
 <pad name="P$22" x="-8.89" y="3.81" drill="1.2"/>
 <pad name="P$23" x="-11.43" y="3.81" drill="1.2"/>
 <pad name="P$24" x="-13.97" y="3.81" drill="1.2"/>
->>>>>>> master
 </package>
 </packages>
 <symbols>
@@ -1124,7 +1124,6 @@
 <text x="216.916" y="4.953" size="2.54" layer="94" font="vector">Sheet:</text>
 <frame x1="0" y1="0" x2="260.35" y2="179.07" columns="6" rows="4" layer="94"/>
 </symbol>
-<<<<<<< HEAD
 <symbol name="XXX1117">
 <wire x1="-5.08" y1="-5.08" x2="5.08" y2="-5.08" width="0.4064" layer="94"/>
 <wire x1="5.08" y1="-5.08" x2="5.08" y2="2.54" width="0.4064" layer="94"/>
@@ -1138,7 +1137,7 @@
 <pin name="IN" x="-7.62" y="0" visible="off" length="short" direction="in"/>
 <pin name="GND" x="0" y="-7.62" visible="off" length="short" direction="in" rot="R90"/>
 <pin name="OUT" x="7.62" y="0" visible="off" length="short" direction="pas" rot="R180"/>
-=======
+</symbol>
 <symbol name="MSGEQ7">
 <wire x1="-10.16" y1="7.62" x2="-10.16" y2="-5.08" width="0.4064" layer="94"/>
 <wire x1="10.16" y1="-5.08" x2="-10.16" y2="-5.08" width="0.4064" layer="94"/>
@@ -1269,7 +1268,6 @@
 <pin name="P$22" x="17.78" y="22.86" length="middle" rot="R180"/>
 <pin name="P$23" x="17.78" y="27.94" length="middle" rot="R180"/>
 <pin name="P$24" x="17.78" y="33.02" length="middle" rot="R180"/>
->>>>>>> master
 </symbol>
 </symbols>
 <devicesets>
@@ -1634,26 +1632,16 @@ DIN A4, landscape with location and doc. field</description>
 <gate name="G$1" symbol="A4L-LOC" x="0" y="0"/>
 </gates>
 <devices>
-<device name="">
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
 </devices>
 </deviceset>
-<<<<<<< HEAD
 <deviceset name="XXX1117" prefix="IC" uservalue="yes">
 <description>&lt;b&gt;VOLTAGE REGULATOR&lt;/b&gt;</description>
 <gates>
 <gate name="1" symbol="XXX1117" x="0" y="0"/>
 </gates>
 <devices>
-<device name="-SOT89" package="SOT89">
-<connects>
-<connect gate="1" pin="GND" pad="1" route="any"/>
-<connect gate="1" pin="IN" pad="3"/>
-<connect gate="1" pin="OUT" pad="2"/>
-=======
+</devices>
+</deviceset>
 <deviceset name="IC_MSGEQ7" prefix="IC">
 <description>seven band Graphic Equalizer IC</description>
 <gates>
@@ -1677,50 +1665,6 @@ DIN A4, landscape with location and doc. field</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="ATTANI_BREAKOUT_PINS" prefix="HOLES" uservalue="yes">
-<description>foorprint for the ATtami dev board</description>
-<gates>
-<gate name="G$1" symbol="ATTAMI_BREAKOUT_SHEILD" x="0" y="40.64"/>
-</gates>
-<devices>
-<device name="HOLES" package="BREAKOUT_ATTAMI">
-<connects>
-<connect gate="G$1" pin="GND" pad="7.GND"/>
-<connect gate="G$1" pin="GND@1" pad="10.GND"/>
-<connect gate="G$1" pin="GND@2" pad="8.GND"/>
-<connect gate="G$1" pin="PB0" pad="6.PB0"/>
-<connect gate="G$1" pin="PB1" pad="5.PB1"/>
-<connect gate="G$1" pin="PB2" pad="4.PB2"/>
-<connect gate="G$1" pin="PB3" pad="3.PB3"/>
-<connect gate="G$1" pin="PB4" pad="2.PB4"/>
-<connect gate="G$1" pin="PB5" pad="1.PB5"/>
-<connect gate="G$1" pin="VCC" pad="9.VCC"/>
-<connect gate="G$1" pin="V_BAT" pad="11.BAT"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="NOHOLE" package="BREAKOUT_TAMI_NOHOLES">
-<connects>
-<connect gate="G$1" pin="GND" pad="7.GND"/>
-<connect gate="G$1" pin="GND@1" pad="10.GND"/>
-<connect gate="G$1" pin="GND@2" pad="8.GND"/>
-<connect gate="G$1" pin="PB0" pad="6.PB0"/>
-<connect gate="G$1" pin="PB1" pad="5.PB1"/>
-<connect gate="G$1" pin="PB2" pad="4.PB2"/>
-<connect gate="G$1" pin="PB3" pad="3.PB3"/>
-<connect gate="G$1" pin="PB4" pad="2.PB4"/>
-<connect gate="G$1" pin="PB5" pad="1.PB5"/>
-<connect gate="G$1" pin="VCC" pad="9.VCC"/>
-<connect gate="G$1" pin="V_BAT" pad="11.BAT"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="ARDUINOR3" prefix="U">
 <description>This is a new object for the new Arduino R3 - with extra pins that you may want to use (such as IOref, and duplicated A4/A5</description>
 <gates>
@@ -1877,7 +1821,6 @@ DIN A4, landscape with location and doc. field</description>
 <connect gate="G$1" pin="P$7" pad="P$7"/>
 <connect gate="G$1" pin="P$8" pad="P$8"/>
 <connect gate="G$1" pin="P$9" pad="P$9"/>
->>>>>>> master
 </connects>
 <technologies>
 <technology name=""/>