From 94ad7e1856718bcad2f176d5ddfcb4a2c73c5614 Mon Sep 17 00:00:00 2001
From: Fahim
Date: Wed, 17 Feb 2016 17:36:59 +0530
Subject: Remove conflict after merge

---
 kicadSchematicLibrary/kicad.pro | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'kicadSchematicLibrary')

diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index 7c43d64d..afdcf2d3 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -40,35 +40,6 @@ LibName6=eSim_Power
 LibName7=eSim_Sources
 LibName8=eSim_Subckt
 LibName9=eSim_User
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=power
-LibName31=device
-LibName32=transistors
-LibName33=conn
-LibName34=linear
-LibName35=regul
-LibName36=74xx
-LibName37=cmos4000
-=======
 LibName10=eSim_Plot
 LibName11=adc-dac
 LibName12=memory
-- 
cgit