1 files changed, 25 insertions, 0 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci
index fd6e7baf..6b3e21f0 100644
--- a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci
@@ -11,28 +11,53 @@
 function AVRPWM1SetDuty(output_pin,duty,Top_Value)
 //Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin.    
 //Parameters
+<<<<<<< HEAD
 //      ouput_pin: integer, 0 (for OC1A) or 1 (for OC1B)
 //
 //      duty:        It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.
 //
 //      Top_Value:   It holds an integer value from 0 to 65535.This value sets the Top value of the counter TCNT1 i.e ICR.(for more info refer datasheet)
+=======
+//      ouput_pin: 
+//                   0 for selecting OC1A as output pin 
+//                   1 for selecting OC1B as output pin
+//
+//      duty:        It holds an integer value from 0 to 100 which sets the percentage
+//                   of time for which signal is active.
+//
+//      Top_Value:   It holds an integer value from 0 to 65535.This value sets the Top 
+//                   value of the counter TCNT1 i.e ICR.(for more info refer datasheet)
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //
 //Description
 //      Each Micro controller has PWM output pins which can generate varying voltage
 //      from 0V-5V.This function Sets the duty cycle of output PWM signal.Also this function 
 //      decides the Top Vale of TCNT1 and the output pin to output PWM signal.
 //
+<<<<<<< HEAD
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for AVR.
 //
 //Example
 //      AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty cycle on OC1A pin and TCNT1 will reset at 40000 instead at 65535.
+=======
+//Example
+//      AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty
+//                                    cycle on OC1A pin and TCNT1 will reset at 40000 instead 
+//                                    at 65535.
+//      
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //See also
 //     AVRPWM1Setup
 //
 //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
 
 if(output_pin>=2) then
 disp("Error : Invalid input argument ''output_pin'' in AVRPWM1SetDuty function.");