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

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

diff --git a/library/atmel.lib b/library/atmel.lib
index 621cf4d3..209238b5 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -10995,10 +10995,10 @@ ENDDEF
 #
 # AVR-PDI-6
 #
-DEF AVR-PDI-6 CON 0 40 Y Y 1 F N
+DEF AVR-PUDI-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
+F1 "AVR-PUDI-6" -210 -245 50 H V L BNN
+F2 "AVR-PUDI-6" -445 35 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
 T 0 -350 0 45 0 0 0 NC  Normal 1 C C