Scilab2C Arduino Updated

1 files changed, 19 insertions, 0 deletions

diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci
index 695c708d..150b9fe9 100644
--- a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci
@@ -10,6 +10,7 @@
 
 function AVRUARTTransmit(data)
 // Function to Transmit data using UART or USART.
+<<<<<<< HEAD
 //       
 // Parameter
 //        data : The data to be transmitted can be a Char,String,Unsigned Int,Signed Int.        
@@ -23,6 +24,19 @@ function AVRUARTTransmit(data)
 //
 //Examples
 //    AVRUARTTransmit("This is example");  //This function will transmit the entered string.                 
+=======
+// Description
+//        This function Tranmits data over UART or USART.The data to be transmitted can 
+//        be a Char , String , Unsigned Int, Signed Int. 
+//       
+// Parameter
+//        data : 
+//             The data to be transmitted can be a Char,String,Unsigned Int,Signed Int.        
+//
+//Examples
+//    AVRUARTTransmit("This is example");  //This function will transmit the entered string.
+//                               
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //See also
 //     AVRUARTSetup
 //     AVRUARTReceive
@@ -30,4 +44,9 @@ function AVRUARTTransmit(data)
 // Authors
 //     Ashish Kamble
 //
+<<<<<<< HEAD
+=======
+// This is curretly dummy function. It provides no functionality but is required 
+// for providing support for generating C code for AVR.    
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 endfunction