From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 macros/Hardware/AVR/AVRDigitalOut.sci | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'macros/Hardware/AVR/AVRDigitalOut.sci')

diff --git a/macros/Hardware/AVR/AVRDigitalOut.sci b/macros/Hardware/AVR/AVRDigitalOut.sci
index a80aff0f..0efc927b 100644
--- a/macros/Hardware/AVR/AVRDigitalOut.sci
+++ b/macros/Hardware/AVR/AVRDigitalOut.sci
@@ -26,7 +26,6 @@ function AVRDigitalOut(port,pin,state)
 //     digital output. Also, desired output state must be specified as 
 //     'HIGH' or 'LOW'.     
 //
-<<<<<<< HEAD
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for AVR.
 //
@@ -39,20 +38,6 @@ function AVRDigitalOut(port,pin,state)
 //     Siddhesh Wani
 //     Ashish Kamble
 //
-=======
-// Examples
-//     AVRDigitalOut('A',0,HIGH)
-//
-// See also
-//     AVRDigitalIn
-//
-//
-// Authors
-//     Siddhesh Wani Ashish Kamble
-//
-// This is curretly dummy function. It provides no functionality but is required 
-// for providing support for generating C code for AVR.
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 if((port==0)|(port>=8)) then 
 disp("Error : Inavalid input argument ''port'' in AVRDigitalOut function.");
-- 
cgit