- merge was completely fucked. Should be fixed now

MV_Abnehmerplatine_FT24/MV_Abnehmerplatine.kicad_pro

@@ -73,7 +73,6 @@
         "footprint_type_mismatch": "ignore",
         "hole_clearance": "error",
         "hole_near_hole": "error",
-        "holes_co_located": "warning",
         "invalid_outline": "error",
         "isolated_copper": "warning",
         "item_on_disabled_layer": "error",
@@ -117,11 +116,7 @@
         "min_hole_to_hole": 0.25,
         "min_microvia_diameter": 0.2,
         "min_microvia_drill": 0.1,
-<<<<<<< HEAD
-        "min_resolved_spokes": 2,
-=======
         "min_resolved_spokes": 1,
->>>>>>> 07d39d5 (- MV_Abnehmerplatine is fertig)
         "min_silk_clearance": 0.0,
         "min_text_height": 0.8,
         "min_text_thickness": 0.08,
@@ -477,23 +472,14 @@
       "plot": "",
       "pos_files": "",
       "specctra_dsn": "",
-<<<<<<< HEAD
-      "step": "../stp/MV_Abnehmerplatine.step",
-=======
       "step": "MV_Abnehmerplatine.step",
->>>>>>> 07d39d5 (- MV_Abnehmerplatine is fertig)
       "svg": "",
       "vrml": ""
     },
     "page_layout_descr_file": ""
   },
   "schematic": {
-<<<<<<< HEAD
-    "annotate_start_num": 0,
-    "bom_export_filename": "",
-=======
     "annotate_start_num": -1,
->>>>>>> 07d39d5 (- MV_Abnehmerplatine is fertig)
     "bom_fmt_presets": [],
     "bom_fmt_settings": {
       "field_delimiter": ",",