diff options
| author | Fahim | 2016-02-17 17:14:07 +0530 |
|---|---|---|
| committer | Fahim | 2016-02-17 17:14:07 +0530 |
| commit | f4d9082f5f217db6e592cf67c5add1170ec57c04 (patch) | |
| tree | a029a773807669ad6dd6afa9d4c21ae4bed47e37 | |
| parent | d634304de8022c499b1a4a23c85aa5f124539d93 (diff) | |
| download | eSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.tar.gz eSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.tar.bz2 eSim-f4d9082f5f217db6e592cf67c5add1170ec57c04.zip | |
Remove Conflict
| -rw-r--r-- | kicadSchematicLibrary/kicad.pro | 2 | ||||
| -rw-r--r-- | src/ngspicetoModelica/__init__.py | 0 |
2 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 diff --git a/src/ngspicetoModelica/__init__.py b/src/ngspicetoModelica/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/src/ngspicetoModelica/__init__.py +++ /dev/null |