From 0c47a8da9c8e5045e320263c031ed4b5529b85f3 Mon Sep 17 00:00:00 2001
From: just-trey <trey.wentz@gmail.com>
Date: Mon, 19 Dec 2022 23:16:32 -0500
Subject: [PATCH] resovel conflict

---
 resources/definitions/ankermake_m5.def.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json
index ea2a332be7..1b7d355337 100644
--- a/resources/definitions/ankermake_m5.def.json
+++ b/resources/definitions/ankermake_m5.def.json
@@ -14,7 +14,6 @@
     "preferred_material": "generic_pla",
     "preferred_quality_type": "normal"
   },
-
   "overrides": {
     "machine_name": { "default_value": "AnkerMake M5" },
     "machine_start_gcode": {