From b2776fe066cfd9c9358c941ec38bfad26b188a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Est=C3=A9fano=20Bargas?= <estefano.bargas@fing.edu.uy>
Date: Thu, 3 Oct 2024 13:59:23 -0300
Subject: [PATCH] Fix conflict

---
 example/app/src/main.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/example/app/src/main.rs b/example/app/src/main.rs
index 2b1196b0..c7533e68 100644
--- a/example/app/src/main.rs
+++ b/example/app/src/main.rs
@@ -75,7 +75,7 @@ async fn main() {
             error!("Error getting Sudoku vality contract address");
             process::exit(1);
         }),
-        _ => todo!()
+        _ => todo!(),
     };
 
     let wallet_alloy =
@@ -202,7 +202,6 @@ async fn main() {
             });
 
             debug!("Creating contract instance");
-<<<<<<< HEAD
             let sudoku_address = match chain {
                 Chain::Devnet => SUDOKU_VALIDITY_DEVNET_ADDRESS,
                 Chain::Holesky => {
@@ -213,8 +212,7 @@ async fn main() {
                 }
                 _ => todo!(),
             };
-=======
->>>>>>> aligned
+
             let contract =
                 SudokuValidity::new(Address::from_str(&sudoku_address).unwrap(), provider);