Skip to content

Commit

Permalink
Fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Luijken committed Aug 22, 2024
1 parent bdfe00e commit 3b2582d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion stellar_rust_sdk/src/models/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions stellar_rust_sdk/src/transactions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down

0 comments on commit 3b2582d

Please sign in to comment.