From 78809e3c55076ff7bc53c6a1990e9435c82ad096 Mon Sep 17 00:00:00 2001
From: Thomas Luijken <thomas@luijken.dev>
Date: Thu, 22 Aug 2024 16:56:30 +0200
Subject: [PATCH] Fixed merge conflicts

---
 stellar_rust_sdk/src/models/mod.rs       | 1 -
 stellar_rust_sdk/src/transactions/mod.rs | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/stellar_rust_sdk/src/models/mod.rs b/stellar_rust_sdk/src/models/mod.rs
index 18cbd23..75bb7ee 100644
--- a/stellar_rust_sdk/src/models/mod.rs
+++ b/stellar_rust_sdk/src/models/mod.rs
@@ -46,7 +46,6 @@ pub(crate) trait PostRequest {
     /// includes complex query parameters.
     ///
     fn build_url(&self, base_url: &str) -> String;
-
 }
 
 /// Defines methods for creating HTTP requests to the Horizon server.
diff --git a/stellar_rust_sdk/src/transactions/mod.rs b/stellar_rust_sdk/src/transactions/mod.rs
index 52424fe..f8b3f20 100644
--- a/stellar_rust_sdk/src/transactions/mod.rs
+++ b/stellar_rust_sdk/src/transactions/mod.rs
@@ -111,6 +111,7 @@ pub(crate) static TRANSACTIONS_PATH: &str = "transactions";
 /// ```
 pub mod prelude {
     pub use super::all_transactions_request::*;
+    pub use super::post_transaction_request::*;
     pub use super::response::*;
     pub use super::single_transaction_request::*;
     pub use super::transactions_for_account_request::*;