From 36d8e102793e37943ca70732f12c840713f0d990 Mon Sep 17 00:00:00 2001
From: cets <cets@CS-DEV-03>
Date: Thu, 5 Jan 2017 14:59:11 +0100
Subject: [PATCH] additional fix

---
 extras/ina3221/ina3221.c | 5 ++---
 extras/ssd1306/ssd1306.c | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/extras/ina3221/ina3221.c b/extras/ina3221/ina3221.c
index c085c3e..643f1c1 100644
--- a/extras/ina3221/ina3221.c
+++ b/extras/ina3221/ina3221.c
@@ -29,12 +29,11 @@ static int _wireWriteRegister (uint8_t addr, uint8_t reg, uint16_t value)
 
 static int _wireReadRegister(uint8_t addr, uint8_t reg, uint16_t *value)
 {
-    int error = 0;
     uint8_t d[] = {0, 0};
-    return i2c_slave_read(addr, &reg, d, sizeof(d), false);
+    int error = i2c_slave_read(addr, &reg, d, sizeof(d), false)
     debug("Data read from %02X: %02X+%04X\n",addr,reg,*value);
     *value = d[1] | (d[0] << 8);
-    return 0 ;
+    return error;
 }
 
 int ina3221_trigger(ina3221_t *dev)
diff --git a/extras/ssd1306/ssd1306.c b/extras/ssd1306/ssd1306.c
index f467942..cb3e0f6 100644
--- a/extras/ssd1306/ssd1306.c
+++ b/extras/ssd1306/ssd1306.c
@@ -254,11 +254,7 @@ int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[])
         case SSD1306_PROTO_I2C:
             for (i = 0; i < len; i++)
             {
-<<<<<<< HEAD
                 if(dev->screen == SH1106_SCREEN && i%dev->width == 0) sh1106_go_coordinate(dev,0,i/dev->width);
-=======
-                if(dev->screen == SH1106_SCREEN) sh1106_go_coordinate(dev,0,i/dev->width);
->>>>>>> branch 'i2c_optimization' of https://github.com/Zaltora/esp-open-rtos.git
                 i2c_send(dev, 0x40, buf ? &buf[i] : tab, 16);
             }
             break;