summaryrefslogtreecommitdiff
path: root/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci')
-rw-r--r--2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci15
1 files changed, 0 insertions, 15 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci
index a80aff0f..0efc927b 100644
--- a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci
+++ b/2.3-1/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.");