ntearsntei

hardware/68percent/68percent.kicad_prl

@@ -12,13 +12,8 @@
       "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,
@@ -68,11 +63,6 @@
     "version": 5
   },
   "net_inspector_panel": {
-<<<<<<< HEAD
-    "col_hidden": [],
-    "col_order": [],
-    "col_widths": [],
-=======
     "col_hidden": [
       false,
       false,
@@ -115,7 +105,6 @@
       0,
       0
     ],
->>>>>>> hardware-65percent
     "custom_group_rules": [],
     "expanded_rows": [],
     "filter_by_net_name": true,
@@ -126,11 +115,7 @@
     "show_unconnected_nets": false,
     "show_zero_pad_nets": false,
     "sort_ascending": true,
-<<<<<<< HEAD
-    "sorting_column": -1
-=======
     "sorting_column": 0
->>>>>>> hardware-65percent
   },
   "open_jobsets": [],
   "project": {