summaryrefslogtreecommitdiff
path: root/kicadSchematicLibrary
diff options
context:
space:
mode:
authorFahim2016-02-17 17:14:07 +0530
committerFahim2016-02-17 17:14:07 +0530
commitf4d9082f5f217db6e592cf67c5add1170ec57c04 (patch)
treea029a773807669ad6dd6afa9d4c21ae4bed47e37 /kicadSchematicLibrary
parentd634304de8022c499b1a4a23c85aa5f124539d93 (diff)
downloadeSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.tar.gz
eSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.tar.bz2
eSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.zip
Remove Conflict
Diffstat (limited to 'kicadSchematicLibrary')
-rw-r--r--kicadSchematicLibrary/kicad.pro2
1 files changed, 0 insertions, 2 deletions
diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index e2569a1f..7c43d64d 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -40,7 +40,6 @@ LibName6=eSim_Power
LibName7=eSim_Sources
LibName8=eSim_Subckt
LibName9=eSim_User
-<<<<<<< HEAD
LibName10=adc-dac
LibName11=memory
LibName12=xilinx
@@ -99,4 +98,3 @@ LibName35=linear
LibName36=regul
LibName37=74xx
LibName38=cmos4000
->>>>>>> develop