diff options
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRSleep.sci')
| -rw-r--r-- | 2.3-1/macros/Hardware/AVR/AVRSleep.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.sci b/2.3-1/macros/Hardware/AVR/AVRSleep.sci index eec6e5a2..005fe4ed 100644 --- a/2.3-1/macros/Hardware/AVR/AVRSleep.sci +++ b/2.3-1/macros/Hardware/AVR/AVRSleep.sci @@ -1,4 +1,5 @@ function AVRSleep(delay) +<<<<<<< HEAD // Function to pause the execution for the given time. // // Parameter @@ -17,5 +18,8 @@ function AVRSleep(delay) // Authors // Jorawar Singh // +======= + +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction |