diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /macros/Hardware/AVR/AVRSleep.sci | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'macros/Hardware/AVR/AVRSleep.sci')
| -rw-r--r-- | macros/Hardware/AVR/AVRSleep.sci | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/Hardware/AVR/AVRSleep.sci b/macros/Hardware/AVR/AVRSleep.sci index eec6e5a2..005fe4ed 100644 --- a/macros/Hardware/AVR/AVRSleep.sci +++ b/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 |