# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2015-03-16 22:46:30
# Node ID d613531b2bc52c218cc4f7f2b4a921cd1ff98ceb
# Parent  4f65a897afafada30b6b1da07a0f682d5b2d0d29

Fix merge

diff --git a/hab.brd b/hab.brd
--- a/hab.brd
+++ b/hab.brd
@@ -1177,7 +1177,7 @@ design rules under a new name.</descript
 <element name="C9" library="SparkFun" package="0805" value="47uF" x="15.636875" y="9.8425" rot="MR0"/>
 <element name="C5" library="SparkFun" package="0402-CAP" value="0.1uF" x="11.033125" y="17.700625" rot="R180"/>
 <element name="C8" library="SparkFun" package="0402-CAP" value="0.1uF" x="19.446875" y="16.66875" rot="R90"/>
-<element name="U$3" library="Protofusion" package="FEATHERHAB-ALPHA" value="" x="0.3175" y="12.22375"/>
+<element name="U$9" library="Protofusion" package="FEATHERHAB-ALPHA" value="" x="0.3175" y="12.22375"/>
 <element name="U$3" library="Protofusion" package="CRYSTAL-3.2X2.5" value="VG-4231CE" x="11.1125" y="15.001875" rot="R270"/>
 <element name="C10" library="SparkFun" package="0402-CAP" value="15pF" x="11.033125" y="18.89125" rot="R180"/>
 <element name="R3" library="SparkFun" package="0402-RES" value="100k" x="11.033125" y="20.16125" rot="R180"/>