Merge conflicts resolved

nikkobautista · May 11, 2022 · 7434b35 · 7434b35
2 parents 1a1869f + b05f788
commit 7434b35
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 3 deletions.
diff --git a/content/collections/switches/gateron-black.md b/content/collections/switches/gateron-black.md
@@ -214,6 +214,13 @@ prices:
     vendor: the-keycap-club
     datecheck: '2021-06-23'
     in_stock: true
+  -
+    price: '0.32'
+    extra_text: null
+    source: 'https://keebd.com/products/gateron-black'
+    vendor: keebd
+    datecheck: '2022-05-01'
+    in_stock: true
 updated_by: 346c3162-6b01-4097-b7ee-8c4482d3ec52
 updated_at: 1643935840
 stem_length: standard

diff --git a/content/collections/switches/gateron-cap-yellow.md b/content/collections/switches/gateron-cap-yellow.md
@@ -447,6 +447,19 @@ prices:
     source: 'https://keebhut.com/products/gateron-cap-v2-golden-yellow-linear-switches'
     vendor: the-keyboard-hut
     datecheck: '2022-04-20'
+  -
+    price: '0.45'
+    extra_text: 'Milky Yellow'
+    source: 'https://keebd.com/products/gateron-cap-milky-yellow'
+    vendor: keebd
+    datecheck: '2022-05-11'
+    in_stock: true
+  -
+    price: '0.55'
+    extra_text: 'Golden Yellow'
+    source: 'https://keebd.com/products/gateron-cap-golden-yellow'
+    vendor: keebd
+    datecheck: '2022-05-11'
     in_stock: true
 limited_run: 'no'
 limited_run_reason: 'no'

diff --git a/content/collections/switches/gateron-green.md b/content/collections/switches/gateron-green.md
@@ -199,6 +199,13 @@ prices:
     vendor: kbdfans
     datecheck: '2022-02-03'
     in_stock: true
+   -
+    price: '0.32'
+    extra_text: null
+    source: 'https://keebd.com/products/gateron-green'
+    vendor: keebd
+    datecheck: '2022-05-01'
+    in_stock: true
 mechbox_affiliate_link: 'https://mechbox.co.uk/products/gateron-milky-green-switch?variant=39826384945314'
 limited_run: 'no'
 limited_run_reason: 'no'

diff --git a/content/collections/switches/gateron-ink-black-v2.md b/content/collections/switches/gateron-ink-black-v2.md
@@ -249,6 +249,13 @@ prices:
     vendor: serpentkeys
     datecheck: null
     in_stock: true
+  -
+    price: '0.75'
+    extra_text: null
+    source: 'https://keebd.com/products/gateron-ink-black'
+    vendor: keebd
+    datecheck: '2022-05-01'
+    in_stock: true
 updated_by: 346c3162-6b01-4097-b7ee-8c4482d3ec52
 updated_at: 1649696091
 stem_length: standard

diff --git a/content/collections/switches/gateron-oil-king.md b/content/collections/switches/gateron-oil-king.md
@@ -170,6 +170,12 @@ prices:
     datecheck: '2022-03-06'
     in_stock: true
     extra_text: null
+  -
+    price: '0.75'
+    source: 'https://keebd.com/products/gateron-oil-king'
+    vendor: keebd
+    datecheck: '2022-05-11'
+    in_stock: true
 limited_run: 'no'
 limited_run_reason: 'no'
 photos:

diff --git a/content/collections/switches/gateron-yellow.md b/content/collections/switches/gateron-yellow.md
@@ -502,11 +502,18 @@ prices:
     datecheck: '2022-02-01'
     in_stock: true
   -
-    price: '0.45'
+    price: '0.32'
     extra_text: KS-8
-    source: 'https://keebd.com/products/gateron-5pin-switches-pack-of-10?variant=40383061295256'
+    source: 'https://keebd.com/products/gateron-yellow'
+    vendor: keebd
+    datecheck: '2022-05-01'
+    in_stock: true
+  -
+    price: '0.32'
+    extra_text: KS-3X1
+    source: 'https://keebd.com/products/gateron-milky-yellow'
     vendor: keebd
-    datecheck: '2022-04-01'
+    datecheck: '2022-05-01'
     in_stock: true
 updated_by: 346c3162-6b01-4097-b7ee-8c4482d3ec52
 updated_at: 1648818473