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"

---
 .../src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h  | 11 -----------
 1 file changed, 11 deletions(-)

(limited to '2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h')

diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
index b9087d77..e75a5394 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
@@ -5,11 +5,7 @@
  you should have received as part of this distribution.  The terms
  are also available at
  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-<<<<<<< HEAD
  Author: Siddhesh Wani, Jorawar Singh
-=======
- Author: Siddhesh Wani
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
 */
@@ -26,17 +22,10 @@ extern "C" {
 #include "types.h"
 #include "wiringPi.h"
 
-<<<<<<< HEAD
 void u32RPI_delays(uint32 time);
 void u32RPI_delayMicros(uint32 time);
 uint32 RPI_millis();
 uint32 RPI_micros();
-=======
-void u16RPIDelayMillis(uint16 time);
-void u16RPIDelayMicros(uint16 time);
-uint32 u32RPIGetMillis();
-uint32 u32RPIGetMicros();
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus
 } /* extern "C" */
-- 
cgit