# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-01-31 14:20:11
# Node ID 8ac8611a6b95612d5b432f96f5ae58714f7b6b8e
# Parent  58d9bebc28f46f1b678b2d72f16e6970526a6727

Merge EPF conflicts

diff --git a/master/eagle.epf b/master/eagle.epf
--- a/master/eagle.epf
+++ b/master/eagle.epf
@@ -339,19 +339,12 @@ UsedLibrary="C:/Program Files (x86)/EAGL
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/xilinx-xcv.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/zetex.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.3.0/lbr/zilog.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/adafruit.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/dp_devices.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/Protofusion.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-CON-JST-ZH.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-Connector SMD.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SLAT-Connector TH.lbr"
-UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SparkFun.lbr"
+UsedLibrary="C:/Users/ethanzonca/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
 
 [Win_1]
 Type="Control Panel"
-Loc="306 94 1133 634"
-State=2
+Loc="-3 385 596 784"
+State=0
 Number=0
 
 [Desktop]