From 1a5a5d309310794d5e071fad9c01bd853eb7a2d8 Mon Sep 17 00:00:00 2001
From: BitcoinZavior <BitcoinZavior@GMail.Com>
Date: Thu, 18 Jul 2024 22:12:42 -0400
Subject: [PATCH] resolved merge issues

---
 .github/workflows/precompile_binaries.yml | 2 +-
 rust/src/api/mod.rs                       | 1 -
 rust/src/utils/error.rs                   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/precompile_binaries.yml b/.github/workflows/precompile_binaries.yml
index c38a2df..c2b99fb 100644
--- a/.github/workflows/precompile_binaries.yml
+++ b/.github/workflows/precompile_binaries.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [upgrade-v0.18, main]
+    branches: [main]
 
 name: Precompile Binaries
 
diff --git a/rust/src/api/mod.rs b/rust/src/api/mod.rs
index 860a805..91b058d 100644
--- a/rust/src/api/mod.rs
+++ b/rust/src/api/mod.rs
@@ -2,4 +2,3 @@ pub mod io;
 pub mod receive;
 pub mod send;
 pub mod uri;
-pub mod io;
diff --git a/rust/src/utils/error.rs b/rust/src/utils/error.rs
index df305c2..4ae2636 100644
--- a/rust/src/utils/error.rs
+++ b/rust/src/utils/error.rs
@@ -45,7 +45,7 @@ pub enum PayjoinError {
     PjParseError {
         message: String,
     },
-    PjNotSupported{
+    PjNotSupported {
         message: String,
     },
     ValidationError {