Fix merge conflict

solana-labs · Apr 22, 2021 · 6bb0d32 · 6bb0d32
1 parent 2aaae8c
commit 6bb0d32
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml
@@ -28,9 +28,5 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
-<<<<<<< HEAD
-solana-stake-program = { path = "../programs/stake", version = "=1.6.7" }
-=======
 assert_matches = "1.3.0"
-solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
->>>>>>> f4214637a... program-test: Add large bootstrap stake for realistic warmups (#16739)
+solana-stake-program = { path = "../programs/stake", version = "=1.6.7" }