Merge branch 'hardware-65percent' into dev

hardware/68percent/68percent.kicad_prl

@@ -12,8 +12,13 @@
       "pads": 1.0,
       "shapes": 1.0,
       "tracks": 1.0,
+<<<<<<< HEAD
       "vias": 1.0,
       "zones": 0.6
+=======
+      "vias": 0.75,
+      "zones": 0.2199999988079071
+>>>>>>> hardware-65percent
     },
     "selection_filter": {
       "dimensions": true,
@@ -63,9 +68,54 @@
     "version": 5
   },
   "net_inspector_panel": {
+<<<<<<< HEAD
     "col_hidden": [],
     "col_order": [],
     "col_widths": [],
+=======
+    "col_hidden": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ],
+    "col_order": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11
+    ],
+    "col_widths": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+>>>>>>> hardware-65percent
     "custom_group_rules": [],
     "expanded_rows": [],
     "filter_by_net_name": true,
@@ -76,7 +126,11 @@
     "show_unconnected_nets": false,
     "show_zero_pad_nets": false,
     "sort_ascending": true,
+<<<<<<< HEAD
     "sorting_column": -1
+=======
+    "sorting_column": 0
+>>>>>>> hardware-65percent
   },
   "open_jobsets": [],
   "project": {