fix merge error

Chuck Todd · Chuck Todd · commit a59e1e515ffc · 2017-11-25T11:45:13.000-07:00
Still learning how to commit
diff --git a/cores/esp32/esp32-hal-i2c.c b/cores/esp32/esp32-hal-i2c.c
@@ -1131,17 +1131,10 @@ if(i2c->intr_handle){
   i2c->intr_handle=NULL;
   }
 if(i2c->i2c_event){
-<<<<<<< HEAD
   vEventGroupDelete(i2c->i2c_event);
   i2c->i2c_event = NULL;
   }
 return i2cFreeQueue(i2c);
-=======
-  xEventGroupDelete(i2c->i2c_event);
-  i2c->i2c_event = NULL;
-  }
-return i2cFreeQueue(i2c); //release dynamic memory
->>>>>>> origin/master
 }
 
 /* todo

Original file line number	Diff line number	Diff line change
`@@ -1131,17 +1131,10 @@ if(i2c->intr_handle){`
`1131`	`1131`	`i2c->intr_handle=NULL;`
`1132`	`1132`	`}`
`1133`	`1133`	`if(i2c->i2c_event){`
`1134`		`-<<<<<<< HEAD`
`1135`	`1134`	`vEventGroupDelete(i2c->i2c_event);`
`1136`	`1135`	`i2c->i2c_event = NULL;`
`1137`	`1136`	`}`
`1138`	`1137`	`return i2cFreeQueue(i2c);`
`1139`		`-=======`
`1140`		`- xEventGroupDelete(i2c->i2c_event);`
`1141`		`- i2c->i2c_event = NULL;`
`1142`		`- }`
`1143`		`-return i2cFreeQueue(i2c); //release dynamic memory`
`1144`		`->>>>>>> origin/master`
`1145`	`1138`	`}`
`1146`	`1139`
`1147`	`1140`	`/* todo`