From 953053835cd20d2279e7b6655d4f73ff7a5d2820 Mon Sep 17 00:00:00 2001
From: El3ctr0nic <szumlanski.marcin@gmail.com>
Date: Thu, 14 Apr 2016 14:47:53 +0200
Subject: [PATCH] ir.lib KLC fix

Try to fix my mess ;)
---
 library/ir.dcm | 18 --------------
 library/ir.lib | 66 --------------------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/library/ir.dcm b/library/ir.dcm
index 3098d9e6..de4c2fa1 100644
--- a/library/ir.dcm
+++ b/library/ir.dcm
@@ -18,23 +18,6 @@ K Gate Driver
 F http://www.irf.com/product-info/datasheets/data/ir2104.pdf
 $ENDCMP
 #
-<<<<<<< HEAD
-$CMP IR2110-1PbF
-D IR2110 - HIGH AND LOW SIDE DRIVER
-F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
-$ENDCMP
-#
-$CMP IR2113-1PbF
-D IR2110 - HIGH AND LOW SIDE DRIVER
-F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
-$ENDCMP
-#
-$CMP IR2113PbF
-D IR2110 - HIGH AND LOW SIDE DRIVER
-F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
-$ENDCMP
-#
-=======
 $CMP IR2110
 D High and Low Side Gate Driver,  Output Current 2,0/2,0[A], PDIP-14 , SOIC-14
 K Gate Driver
@@ -47,7 +30,6 @@ K Gate Driver
 F http://www.irf.com/product-info/datasheets/data/ir2110.pdf
 $ENDCMP
 #
->>>>>>> refs/remotes/origin/master
 $CMP IRS2181
 D High and Low Side Gate Driver,  Output Current 1,4/1,8[A], PDIP-8 , SOIC-8
 K Gate Driver
diff --git a/library/ir.lib b/library/ir.lib
index b422d081..4bf96537 100644
--- a/library/ir.lib
+++ b/library/ir.lib
@@ -4,89 +4,46 @@ EESchema-LIBRARY Version 2.3
 # AUIPS7111S
 #
 DEF AUIPS7111S U 0 40 Y Y 1 F N
-<<<<<<< HEAD
-F0 "U" 0 200 50 H V C CNN
-F1 "AUIPS7111S" 0 -200 50 H V C CNN
-F2 "" 0 200 50 H V C CNN
-=======
 F0 "U" 0 275 50 H V C CNN
 F1 "AUIPS7111S" 0 200 50 H V C CNN
 F2 "TO-252-5Lead" 0 -200 50 H V C CIN
->>>>>>> refs/remotes/origin/master
 F3 "" 0 200 50 H V C CNN
 $FPLIST
  TO263-5
 $ENDFPLIST
 DRAW
 S -300 150 300 -150 0 1 10 f
-<<<<<<< HEAD
-X In 1 -400 100 100 R 50 50 1 1 I
-X Ifb 2 -400 -100 100 R 50 50 1 1 O
-X Vcc 3 400 100 100 L 50 50 1 1 W
-X Out 4 400 0 100 L 50 50 1 1 w
-X Out 5 400 -100 100 L 50 50 1 1 w
-=======
 X IN 1 -400 100 100 R 50 50 1 1 I
 X IFB 2 -400 -100 100 R 50 50 1 1 O
 X VCC 3 400 100 100 L 50 50 1 1 W
 X OUT 4 400 0 100 L 50 50 1 1 w
 X OUT 5 400 -100 100 L 50 50 1 1 w
->>>>>>> refs/remotes/origin/master
 ENDDRAW
 ENDDEF
 #
 # AUIPS7121R
 #
 DEF AUIPS7121R U 0 40 Y Y 1 F N
-<<<<<<< HEAD
-F0 "U" 0 200 50 H V C CNN
-F1 "AUIPS7121R" 0 -200 50 H V C CNN
-F2 "" 0 200 50 H V C CNN
-=======
 F0 "U" 0 275 50 H V C CNN
 F1 "AUIPS7121R" 0 200 50 H V C CNN
 F2 "TO-263-5Lead" 0 -200 50 H V C CIN
->>>>>>> refs/remotes/origin/master
 F3 "" 0 200 50 H V C CNN
 $FPLIST
  TO263-5
 $ENDFPLIST
 DRAW
 S -300 150 300 -150 0 1 10 f
-<<<<<<< HEAD
-X In 2 -400 100 100 R 50 50 1 1 I
-X Vcc 3 400 100 100 L 50 50 1 1 W
-X Ifb 4 -400 -100 100 R 50 50 1 1 O
-X Out 5 400 -100 100 L 50 50 1 1 w
-=======
 X NC 1 -400 0 100 R 50 50 1 1 N N
 X IN 2 -400 100 100 R 50 50 1 1 I
 X VCC 3 400 100 100 L 50 50 1 1 W
 X IFB 4 -400 -100 100 R 50 50 1 1 O
 X OUT 5 400 -100 100 L 50 50 1 1 w
->>>>>>> refs/remotes/origin/master
 ENDDRAW
 ENDDEF
 #
 # IR2104
 #
 DEF IR2104 U 0 40 Y Y 1 F N
-<<<<<<< HEAD
-F0 "U" 0 250 50 H V C CNN
-F1 "IR2104" 0 -350 50 H V C CNN
-F2 "" 0 250 50 H V C CNN
-F3 "" 0 250 50 H V C CNN
-DRAW
-S -250 200 250 -300 0 1 10 f
-X VCC 1 -400 100 150 R 50 50 1 1 W
-X IN 2 -400 0 150 R 50 50 1 1 I
-X /SD 3 -400 -100 150 R 50 50 1 1 I
-X COM 4 -400 -200 150 R 50 50 1 1 w
-X LO 5 400 -200 150 L 50 50 1 1 w
-X Vs 6 400 -100 150 L 50 50 1 1 W
-X HO 7 400 0 150 L 50 50 1 1 w
-X VB 8 400 100 150 L 50 50 1 1 w
-=======
 F0 "U" 0 525 50 H V C CNN
 F1 "IR2104" 0 450 50 H V C CNN
 F2 "" 0 -450 50 H V C CIN
@@ -105,33 +62,11 @@ X LO 5 300 -300 100 L 50 50 1 1 O
 X VS 6 300 -200 100 L 50 50 1 1 I
 X HO 7 300 -100 100 L 50 50 1 1 O
 X VB 8 300 300 100 L 50 50 1 1 I
->>>>>>> refs/remotes/origin/master
 ENDDRAW
 ENDDEF
 #
 # IR2110
 #
-<<<<<<< HEAD
-DEF IR2110PbF U 0 40 Y Y 1 F N
-F0 "U" 0 450 50 H V C CNN
-F1 "IR2110PbF" 0 -450 50 H V C CNN
-F2 "" 0 450 50 H V C CNN
-F3 "" 0 450 50 H V C CNN
-ALIAS IR2110-1PbF IR2113PbF IR2113-1PbF
-DRAW
-S -300 400 300 -400 0 1 10 f
-X LO 1 -450 300 150 R 50 50 1 1 w
-X COM 2 -450 200 150 R 50 50 1 1 W
-X VCC 3 -450 100 150 R 50 50 1 1 W
-X VS 5 -450 -100 150 R 50 50 1 1 W
-X VB 6 -450 -200 150 R 50 50 1 1 W
-X HO 7 -450 -300 150 R 50 50 1 1 w
-X VDD 9 450 -200 150 L 50 50 1 1 W
-X HIN 10 450 -100 150 L 50 50 1 1 I
-X SD 11 450 0 150 L 50 50 1 1 I
-X LIN 12 450 100 150 L 50 50 1 1 I
-X VSS 13 450 200 150 L 50 50 1 1 W
-=======
 DEF IR2110 U 0 40 Y Y 1 F N
 F0 "U" 0 625 50 H V C CNN
 F1 "IR2110" 0 550 50 H V C CNN
@@ -158,7 +93,6 @@ X SD 11 -300 -300 100 R 50 50 1 1 I
 X LIN 12 -300 -200 100 R 50 50 1 1 I
 X VSS 13 -300 -400 100 R 50 50 1 1 W
 X NC 14 300 0 100 L 50 50 1 1 N N
->>>>>>> refs/remotes/origin/master
 ENDDRAW
 ENDDEF
 #