Resolve merge conflicts

FuelLabs · Aug 27, 2024 · 5c5f7ad · 5c5f7ad
2 parents bab74e4 + 270350e
commit 5c5f7ad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,4 +102,4 @@ abi SRC14 {
     #[storage(read)]
     fn proxy_target() -> Option<ContractId>;
 }
-```
+```