From 3f308630c06ef9b6921c3e1b4757ba45b01b4105 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 5 May 2020 13:59:18 -0700
Subject: [PATCH] Don't add memorial=yes to historic=memorial (close #7569)

---
 data/presets/fields.json          | 2 +-
 data/presets/fields/memorial.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/presets/fields.json b/data/presets/fields.json
index 246a31ca5..ded549f9a 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -262,7 +262,7 @@
   "maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false},
   "maxweight_bridge": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false, "prerequisiteTag": {"key": "bridge", "valueNot": "no"}},
   "maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
-  "memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
+  "memorial": {"key": "memorial", "type": "combo", "label": "Type"},
   "microbrewery": {"key": "microbrewery", "type": "check", "label": "Microbrewery", "terms": ["brewpub", "craft beer"]},
   "mimics": {"key": "mimics", "type": "combo", "label": "Mimics", "terms": ["camoflauged", "disguised", "looks like", "tree"]},
   "min_age": {"key": "min_age", "type": "number", "minValue": 0, "label": "Minimum Age", "terms": ["lower age limit"]},
diff --git a/data/presets/fields/memorial.json b/data/presets/fields/memorial.json
index 12be85774..0fd2418af 100644
--- a/data/presets/fields/memorial.json
+++ b/data/presets/fields/memorial.json
@@ -1,5 +1,5 @@
 {
     "key": "memorial",
-    "type": "typeCombo",
+    "type": "combo",
     "label": "Type"
-}
\ No newline at end of file
+}