Migrate i2c EEPROM_DRIVER to info.json (qmk#22013)

mhamrah · Feb 5, 2024 · 7d43f65 · 7d43f65
1 parent bbdb22d
commit 7d43f65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
@@ -26,7 +26,11 @@
  "layer_count": 6
  },
 =======
+<<<<<<< HEAD
 >>>>>>> 31d48171cc (Migrate i2c EEPROM_DRIVER to info.json (#22013))
+=======
+>>>>>>> fe00bb9746 (Migrate i2c EEPROM_DRIVER to info.json (#22013))
+>>>>>>> a28ec2ca5b (Migrate i2c EEPROM_DRIVER to info.json (#22013))
  "eeprom": {
  "driver": "i2c"
  },

diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
@@ -13,7 +13,11 @@
  "layer_count": 8
  },
 =======
+<<<<<<< HEAD
 >>>>>>> 31d48171cc (Migrate i2c EEPROM_DRIVER to info.json (#22013))
+=======
+>>>>>>> fe00bb9746 (Migrate i2c EEPROM_DRIVER to info.json (#22013))
+>>>>>>> a28ec2ca5b (Migrate i2c EEPROM_DRIVER to info.json (#22013))
  "eeprom": {
  "driver": "i2c"
  },