From b4ffa9c5e884d7dde55f446f3724ca79cf8b92ae Mon Sep 17 00:00:00 2001
From: George Kudrayvtsev <george@stellar.org>
Date: Thu, 12 Oct 2023 09:46:11 -0700
Subject: [PATCH] Merge fixup

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1f32a0d14..1909e381a 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "bignumber.js": "^9.1.2",
     "eventsource": "^2.0.2",
     "randombytes": "^2.1.0",
-    "stellar-base": "10.0.0-beta.2",
+    "stellar-base": "10.0.0-beta.1",
     "toml": "^3.0.0",
     "urijs": "^1.19.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 3f6c7a183..c184bb3d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6670,10 +6670,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stellar-base@10.0.0-beta.2:
-  version "10.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/stellar-base/-/stellar-base-10.0.0-beta.2.tgz#36452bb14a7a9e66175e6231feb64de3d2fe3627"
-  integrity sha512-fgVcNzlGuXTte4gEg3fDA/pJB5VbqfE8+gkbjsphVecDELR8t3K+QalbDhcafi3g54nRYUaHnN7LcGeoschuIA==
+stellar-base@10.0.0-beta.1:
+  version "10.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/stellar-base/-/stellar-base-10.0.0-beta.1.tgz#5b4209fbc44b8af82dd3ee8b7f6f4397126d8c3b"
+  integrity sha512-zXC5AsbUsLi57JruyeIMv23s3iUxq/P2ZFrSJ+FerLIZjSAjY8EDs4zwY4LCuu7swUu46Lm8GK6sqxUZCPekHw==
   dependencies:
     base32.js "^0.1.0"
     bignumber.js "^9.1.2"