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

---
 .../BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib             | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib')

diff --git a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
index 81e6945f..29acff42 100644
--- a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
+++ b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
@@ -29,19 +29,11 @@ X Vdd 16 500 350 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-<<<<<<< HEAD
-# DC
-#
-DEF DC v 0 40 Y Y 1 F N
-F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
-=======
 # DC-RESCUE-BCDToDecimalDecoder
 #
 DEF DC-RESCUE-BCDToDecimalDecoder v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
 F1 "DC-RESCUE-BCDToDecimalDecoder" -200 -50 60 H V C CNN
->>>>>>> fellowship2019-python3
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
-- 
cgit