1 files changed, 13 insertions, 0 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
index 2f40ffb2..b9b88e79 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+/* Copyright (C) 2017 - IIT Bombay - FOSSEE
+=======
 /* Copyright (C) 2016 - IIT Bombay - FOSSEE
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
  This file must be used under the terms of the CeCILL.
  This source file is licensed as described in the file COPYING, which
@@ -19,6 +23,14 @@
 extern "C" {
 #endif
 
+<<<<<<< HEAD
+#include "types.h"
+
+uint8 u8RPI_digitalReads(uint8 pin);
+uint8 RPI_digitalReadByte();
+void u8RPI_digitalWrites(uint8 pin, uint8 state);
+void u8RPI_digitalWriteBytes(uint8 value);
+=======
 
 #include "types.h"
 #include "wiringPi.h"
@@ -28,6 +40,7 @@ extern int phy_pin[];
 void u8RPIDigitalSetups(uint8 pin, uint8 direction);
 void u8RPIDigitalOuts(uint8 pin, uint8 state);
 uint8 u8RPIDigitalIns(uint8 pin);
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus
 } /* extern "C" */