Skip to content

Commit

Permalink
Merge pull request #17 from LtbLightning/upgrade-v0.18
Browse files Browse the repository at this point in the history
resolved merge issues
  • Loading branch information
BitcoinZavior authored Jul 19, 2024
2 parents 8e51e90 + 1a5a5d3 commit 084397e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/precompile_binaries.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [upgrade-v0.18, main]
branches: [main]

name: Precompile Binaries

Expand Down
1 change: 0 additions & 1 deletion rust/src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ pub mod io;
pub mod receive;
pub mod send;
pub mod uri;
pub mod io;
2 changes: 1 addition & 1 deletion rust/src/utils/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub enum PayjoinError {
PjParseError {
message: String,
},
PjNotSupported{
PjNotSupported {
message: String,
},
ValidationError {
Expand Down

0 comments on commit 084397e

Please sign in to comment.