From 3aa3c9f7f6b7e30c89dc8a83515044bb74854064 Mon Sep 17 00:00:00 2001
From: saurabhb17
Date: Wed, 18 Mar 2020 18:27:02 +0530
Subject: fixes in Analysis of Digital ICs directory

---
 .../Analysis_Of_Digital_IC/4012_test/4012_test.pro | 56 ++--------------------
 1 file changed, 4 insertions(+), 52 deletions(-)

(limited to 'Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro')

diff --git a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
index 8af698d3..c335281a 100644
--- a/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
+++ b/Examples/Analysis_Of_Digital_IC/4012_test/4012_test.pro
@@ -1,51 +1,4 @@
-<<<<<<< HEAD
-update=06/01/19 15:09:21
-version=1
-last_client=eeschema
-[general]
-version=1
-RootSch=
-BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=../../eSim/kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=power
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_PSpice
-LibName10=eSim_Sources
-LibName11=eSim_User
-LibName12=eSim_Subckt
-=======
-update=Wed Mar 11 12:50:15 2020
+update=Wed Mar 18 18:18:08 2020
 version=1
 last_client=eeschema
 [general]
@@ -87,7 +40,6 @@ LibName6=eSim_Hybrid
 LibName7=eSim_Miscellaneous
 LibName8=eSim_Plot
 LibName9=eSim_Power
-LibName10=eSim_Subckt
-LibName11=eSim_Sources
-LibName12=eSim_User
->>>>>>> fellowship2019-python3
+LibName10=eSim_Sources
+LibName11=eSim_User
+LibName12=eSim_Subckt
-- 
cgit