Fixed merge conflicts

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.

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::*;