Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed reading errors

  • Loading branch information...
commit de7e0b2ba99860622c3c62651f5927f15b2ba784 1 parent b3ecb03
@cachinchilla3000 cachinchilla3000 authored
Showing with 6 additions and 10 deletions.
  1. +6 −10 IHE.lib
View
16 IHE.lib
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
EESchema-LIBRARY Version 2.3 Date: Fri 31 Aug 2012 04:01:40 PM EDT
-=======
-EESchema-LIBRARY Version 2.3 Date: Wed 01 Aug 2012 07:30:27 PM EDT
->>>>>>> f2e2eee98d6d876a16c6c42231c9fa5dbdeaa241
#encoding utf-8
#
# ARDUINO_MEGA_SHIELD
@@ -138,7 +134,6 @@ X V_IN V_IN -950 -100 300 R 50 50 1 1 W
ENDDRAW
ENDDEF
#
-<<<<<<< HEAD
# ATMEGA328/P_32TQFP
#
DEF ATMEGA328/P_32TQFP U 0 40 Y Y 1 F N
@@ -178,7 +173,9 @@ X AVCC 18 1850 -500 300 L 50 50 1 1 P
X PC5(ADC5SCL/PCINT13) 28 100 1400 300 D 50 50 1 1 P
X ADC6 19 1850 -300 300 L 50 50 1 1 P
X PC6(RESET/PCINT14) 29 -100 1400 300 D 50 50 1 1 P
-=======
+ENDDRAW
+ENDDEF
+#
# ATMEGA16U4
#
DEF ATMEGA16U4 U 0 40 Y Y 1 F N
@@ -230,7 +227,6 @@ X PF5 38 -200 -150 300 D 39 39 1 1 I
X PD1 19 400 150 300 U 39 39 1 1 I
X PB5 29 250 -150 300 D 39 39 1 1 I
X PF4 39 -250 -150 300 D 39 39 1 1 I
->>>>>>> f2e2eee98d6d876a16c6c42231c9fa5dbdeaa241
ENDDRAW
ENDDEF
#
@@ -389,7 +385,6 @@ X 6 6 500 100 300 L 50 50 1 1 P
ENDDRAW
ENDDEF
#
-<<<<<<< HEAD
# L3G4200D
#
DEF L3G4200D U 0 40 Y Y 1 F N
@@ -437,7 +432,9 @@ X NC 11 -100 -600 300 U 50 50 1 1 P
X SETP 12 -250 -600 300 U 50 50 1 1 P
X SETC 13 -400 -600 300 U 50 50 1 1 P
X Vdd 14 -900 0 300 R 50 50 1 1 P
-=======
+ENDDRAW
+ENDDEF
+#
# LED_DRIVER_SC74
#
DEF LED_DRIVER_SC74 U 0 40 Y Y 1 F N
@@ -451,7 +448,6 @@ X LED2 3 200 -500 300 U 50 50 1 1 I
X GND 4 200 600 300 D 50 50 1 1 B
X LED3 5 0 600 300 D 50 50 1 1 I
X R_ext 6 -200 600 300 D 50 50 1 1 B
->>>>>>> f2e2eee98d6d876a16c6c42231c9fa5dbdeaa241
ENDDRAW
ENDDEF
#
Please sign in to comment.
Something went wrong with that request. Please try again.