Resolve merge with main, all tests pass

mrgnlabs · Oct 21, 2024 · 62698c4 · 62698c4
2 parents 73e74ce + 8a01852
commit 62698c4
Show file tree

Hide file tree

Showing 74 changed files with 2,708 additions and 514 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,4 @@ test-ledger/
 
 # Allow specific json files
 !tests/fixtures/**/*.json
-!programs/marginfi/tests/fixtures/**/*.json
+!programs/marginfi/tests/fixtures/**/*.json