From 0dabf7c6aa44cd2e044b4ac78b936da4077f1abb Mon Sep 17 00:00:00 2001
From: DerekGn <9FB2EFB6AF41A7C3>
Date: Sun, 5 Mar 2017 15:25:35 +0000
Subject: [PATCH] Resolved merge conflict

---
 library/atmel.lib | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/atmel.lib b/library/atmel.lib
index ed1bb8aa..621cf4d3 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -10896,7 +10896,7 @@ DEF AVR-ISP-10 CON 0 40 Y Y 1 F N
 F0 "CON" -170 330 50 H V C CNN
 F1 "AVR-ISP-10" -340 -330 50 H V L BNN
 F2 "AVR-ISP-10" -750 50 50 V I C CNN
-F3 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
 T 0 -380 -100 45 0 0 0 SCK  Normal 1 C C
 T 0 230 200 45 0 0 0 VCC  Normal 1 C C
@@ -10932,7 +10932,7 @@ DEF AVR-ISP-6 CON 0 40 Y Y 1 F N
 F0 "CON" -105 240 50 H V C CNN
 F1 "AVR-ISP-6" -265 -230 50 H V L BNN
 F2 "AVR-ISP-6" -520 40 50 V I C CNN
-F3 "" -25 0 50 H V C CNN
+F3 "" -25 0 50 H I C CNN
 DRAW
 T 0 -315 5 45 0 0 0 SCK  Normal 1 C C
 T 0 275 110 45 0 0 0 VCC  Normal 1 C C
@@ -10960,7 +10960,7 @@ DEF AVR-JTAG-10 CON 0 40 Y Y 1 F N
 F0 "CON" -170 330 50 H V C CNN
 F1 "AVR-JTAG-10" -340 -330 50 H V L BNN
 F2 "AVR-JTAG-10" -570 20 50 V I C CNN
-F3 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
  AVR-JTAG-10
 $ENDFPLIST
@@ -10999,7 +10999,7 @@ DEF AVR-PDI-6 CON 0 40 Y Y 1 F N
 F0 "CON" -80 240 50 H V C CNN
 F1 "AVR-PDI-6" -210 -245 50 H V L BNN
 F2 "AVR-PDI-6" -445 35 50 V I C CNN
-F3 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
 T 0 -350 0 45 0 0 0 NC  Normal 1 C C
 T 0 310 110 45 0 0 0 VCC  Normal 1 C C
@@ -11027,7 +11027,7 @@ DEF AVR-TPI-6 CON 0 40 Y Y 1 F N
 F0 "CON" -80 240 50 H V C CNN
 F1 "AVR-TPI-6" -210 -245 50 H V L BNN
 F2 "AVR-PDI-6" -445 35 50 V I C CNN
-F3 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
 T 0 -300 0 45 0 0 0 TPI_C  Normal 1 C C
 T 0 310 110 45 0 0 0 VTG  Normal 1 C C