push conflict resolve

This commit is contained in:
Gregor Hermani
2022-12-21 16:06:28 +01:00
parent 9132a2891b
commit d7863ee7d0
2 changed files with 7067 additions and 6283 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,9 @@
"active_layer": 44,
"active_layer_preset": "",
"auto_track_width": false,
"hidden_nets": [],
"hidden_nets": [
"+ext_3V3"
],
"high_contrast_mode": 0,
"net_color_mode": 1,
"opacity": {
@@ -60,8 +62,8 @@
35,
36
],
"visible_layers": "8023dff_ffffffff",
"zone_display_mode": 0
"visible_layers": "8001020_ffffffff",
"zone_display_mode": 1
},
"meta": {
"filename": "WiFi-Devboard-Pro.kicad_prl",