summaryrefslogtreecommitdiff
path: root/macros/Hardware/AVR/AVRSleep.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch)
tree8fa462e65aca52e5e933dee026a78c31baf0181c /macros/Hardware/AVR/AVRSleep.sci
parentf577f255fd5c1d30bc770e9b053823ada8684528 (diff)
parent69c573fe2e59236f063aaa94dcd44b556f945cbc (diff)
downloadscilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz
scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2
scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/Hardware/AVR/AVRSleep.sci')
-rw-r--r--macros/Hardware/AVR/AVRSleep.sci4
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