From 39874e472e540ca1bb923b97b52900e1d60439cc Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 2.3-1/macros/Hardware/AVR/AVRSleep.sci | 4 ----
 1 file changed, 4 deletions(-)

(limited to '2.3-1/macros/Hardware/AVR/AVRSleep.sci')

diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.sci b/2.3-1/macros/Hardware/AVR/AVRSleep.sci
index 005fe4ed..eec6e5a2 100644
--- a/2.3-1/macros/Hardware/AVR/AVRSleep.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRSleep.sci
@@ -1,5 +1,4 @@
 function AVRSleep(delay)
-<<<<<<< HEAD
 // Function to pause the execution for the given time.
 //       
 // Parameter
@@ -18,8 +17,5 @@ function AVRSleep(delay)
 // Authors
 //     Jorawar Singh
 //
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction
-- 
cgit