Hybrid_OB2021 / Mbed 2 deprecated Hybrid_OB2021_eeprom

EEPROM test

Dependencies:   mbed EEPROM_lib

Diff: main.cpp

Revision:
5:8b4c33da0c71
Parent:
4:b886fe26f396
Child:
6:13bebe6d434a
Child:
7:f89925dac6ca
--- a/main.cpp	Sat May 22 16:07:50 2021 +0000
+++ b/main.cpp	Sat May 22 16:08:50 2021 +0000
@@ -6,13 +6,9 @@
 
 EEPROM_lib EEPROM(i2c_bus, 1);
 
-<<<<<<< working copy
-
 // hoge test
-=======
 // ビッグエンディアン/リトルエンディアンに注意！
 
->>>>>>> merge rev
 int main(){
     //////////////////////////////////////////write
     /*