From 88f41e45d447af48163a65c88b3ddf29004ca092 Mon Sep 17 00:00:00 2001
From: "John P. McCrae" <john@mccr.ae>
Date: Tue, 16 Jan 2024 11:53:18 +0000
Subject: [PATCH] Merge senses of 'climbable'

---
 src/deprecations.csv    |  1 +
 src/yaml/adj.all.yaml   | 12 +-----------
 src/yaml/entries-c.yaml |  2 --
 src/yaml/entries-s.yaml |  4 ++--
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/deprecations.csv b/src/deprecations.csv
index 64d653bc..4a1bb8f9 100644
--- a/src/deprecations.csv
+++ b/src/deprecations.csv
@@ -104,3 +104,4 @@
 "ewn-02424173-v","i33830","ewn-02372362-v","i33603","Duplicate (#949)"
 "ewn-02755779-v","i35426","ewn-02610777-v","i34713","Duplicate (#947)"
 "ewn-01746607-v","i30448","ewn-02560130-v","i34465","Duplicate (#950)"
+"ewn-01729245-s","i9466","ewn-02090537-s","i11414","Duplicate (#987)"
diff --git a/src/yaml/adj.all.yaml b/src/yaml/adj.all.yaml
index 249c2f0c..b9434b02 100644
--- a/src/yaml/adj.all.yaml
+++ b/src/yaml/adj.all.yaml
@@ -120449,7 +120449,6 @@
   similar:
   - 01728957-s
   - 01729130-s
-  - 01729245-s
   - 01729343-s
 01728957-s:
   definition:
@@ -120474,16 +120473,6 @@
   partOfSpeech: s
   similar:
   - 01728765-a
-01729245-s:
-  definition:
-  - capable of being surmounted
-  ili: i9466
-  members:
-  - surmountable
-  - climbable
-  partOfSpeech: s
-  similar:
-  - 01728765-a
 01729343-s:
   definition:
   - capable of being traversed
@@ -145562,6 +145551,7 @@
   - ascendable
   - ascendible
   - climbable
+  - surmountable
   partOfSpeech: s
   similar:
   - 02090368-a
diff --git a/src/yaml/entries-c.yaml b/src/yaml/entries-c.yaml
index dd8a1b80..7f0e03b1 100644
--- a/src/yaml/entries-c.yaml
+++ b/src/yaml/entries-c.yaml
@@ -65950,8 +65950,6 @@ climbable:
     sense:
     - id: climbable%5:00:00:scalable:00
       synset: 02090537-s
-    - id: climbable%5:00:00:passable:00
-      synset: 01729245-s
 climber:
   n:
     pronunciation:
diff --git a/src/yaml/entries-s.yaml b/src/yaml/entries-s.yaml
index 277e1a75..1c51aa14 100644
--- a/src/yaml/entries-s.yaml
+++ b/src/yaml/entries-s.yaml
@@ -139127,8 +139127,8 @@ surmountable:
       - 'insurmountable%3:00:00::'
       id: 'surmountable%3:00:00::'
       synset: 02365376-a
-    - id: surmountable%5:00:00:passable:00
-      synset: 01729245-s
+    - id: surmountable%5:00:01:scalable:00
+      synset: 02090537-s
 surmounted:
   a:
     sense: