Merge branch 'main' into asm-macro-basics

jmchacon · Aug 2, 2024 · c25af7f · c25af7f
2 parents 4510b8a + 9dfddb9
commit c25af7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -82,7 +82,7 @@ rand = "0.8.5"
 regex = "1.10.5"
 rusty6502 = { path = "./", version = "~0.1" }
 serde = "1.0.204"
-serde_json = "1.0.121"
+serde_json = "1.0.122"
 strum_macros = "0.24.1"
 strum = "0.24.1"
 tempfile = "3.10.1"