Resolve merge conflicts

FuelLabs · Dec 16, 2024 · 008116c · 008116c
1 parent a5fb98e
commit 008116c
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/examples/src20-native-asset/multi_asset/src/multi_asset.sw b/examples/src20-native-asset/multi_asset/src/multi_asset.sw
@@ -173,11 +173,7 @@ impl SRC20 for Contract {
 }
 
 abi SetSRC20Data {
-<<<<<<< HEAD
     #[storage(read, write)]
-=======
-    #[storage(read)]
->>>>>>> release
     fn set_src20_data(
         asset: AssetId,
         total_supply: u64,
@@ -188,11 +184,7 @@ abi SetSRC20Data {
 }
 
 impl SetSRC20Data for Contract {
-<<<<<<< HEAD
     #[storage(read, write)]
-=======
-    #[storage(read)]
->>>>>>> release
     fn set_src20_data(
         asset: AssetId,
         supply: u64,
@@ -207,7 +199,6 @@ impl SetSRC20Data for Contract {
         }
         let sender = msg_sender().unwrap();
 
-<<<<<<< HEAD
         match name {
             Some(unwrapped_name) => {
                 storage.name.get(asset).write_slice(unwrapped_name);
@@ -234,11 +225,6 @@ impl SetSRC20Data for Contract {
         SetDecimalsEvent::new(asset, decimals, sender).log();
 
         storage.total_supply.get(asset).write(supply);
-=======
-        SetNameEvent::new(asset, name, sender).log();
-        SetSymbolEvent::new(asset, symbol, sender).log();
-        SetDecimalsEvent::new(asset, decimals, sender).log();
->>>>>>> release
         TotalSupplyEvent::new(asset, supply, sender).log();
     }
 }