From 0e4920a8423e76410d2e185a8379e965aaee204d Mon Sep 17 00:00:00 2001
From: Alan <alan@ssvlabs.io>
Date: Tue, 8 Oct 2024 12:41:29 +0100
Subject: [PATCH] merge

---
 .../signedssvmsg_SignedSSVMessageTest/signedssvmsg valid.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/spectest/generate/state_comparison/signedssvmsg_SignedSSVMessageTest/signedssvmsg valid.json b/types/spectest/generate/state_comparison/signedssvmsg_SignedSSVMessageTest/signedssvmsg valid.json
index 34e50efb1..44d6b801e 100644
--- a/types/spectest/generate/state_comparison/signedssvmsg_SignedSSVMessageTest/signedssvmsg valid.json	
+++ b/types/spectest/generate/state_comparison/signedssvmsg_SignedSSVMessageTest/signedssvmsg valid.json	
@@ -75,10 +75,6 @@
 		],
 		"ExpectedError": "",
 		"RSAPublicKey": [
-<<<<<<< HEAD
-				"LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdUlRTUxjWlhXUXZvVHV3Z0N1VlAKSkRzV3FEZGFGMlhpQnBKenFQcGVidTEzWDh6WVZCaFVKTGhEcGxlb3orVytkLzNQelQ1c2YycGU0VnlOVnFDQwppTzVUenNMa2kwcmM4eUZqcHdPakJGVVI0RmJWL1phQXc5cm9GbFpIdGQyOExhdVpoMnQwcGtTVFpRa1grMjRDCmxLdmQ4Mk8yMjcramRtY1NuTERIZitkV3R6RkVWUjJYRzhSc0FOT0RtaDZCL2F2TUJxUngvYkpWd1F1TEFONHgKaEFBUlBweDdOVE5MeG1UQVljb2NrQWd5MmNYWDM2SVMwZG42RDFtbmF2NkFPT2JoQnd6ZjB4WVIyNVBYdU1JKwpIaUYyK3BwQjcvN00rMGZ2bng5R2N4dGt0NUVSL3FiVUhiQm5SZ1NwQ1I1TDhVMFlybHNLd0tUdGplMk5oSnR6CjR3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K"
-=======
 				"LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBMy9sRndldDV0cXMyanJaanpaR1cKMlhneUt1dXU0blJNcVNwTjJpd1Y1NG0yTUF1cmF1ZzNKQnIzWTQ0Y2NjM1JtTG9wLzV6ZnJiRnQ1cGVFZEtwQQpUYm1abElVSlUxOCtFeWFRWXB2Wk95YzBkaDJQZkpqTjAwTWxJMHVUdFRqVFpDSm9mSlYxVmQ4YzhwbXFOS0UrCklmVjRSTjdOQ3ZLVzNvOXdpSXFndjBVT0hNYmNZUzRFVVNkQTlFWnZQNDAyZG5RY0VjY0NpbEFXV3hRNWJ2a0QKVVNzMGNBV3V6QW0xMzUwcGxmWUMwdGVQSHhlMzlVcU5hL2p1UzZNK2xRUDdaL0sweENjMHA5emdmK0JvYkIrQgp6bkRtQlNaVDFZbTlwcGl1RHJhS3hncVVUVEJUYXpwMFZ1cGNLbzBKTVpxK1V4NzA5MWJSQlJUYnlJcW54NG1nCk53SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K"
->>>>>>> origin/main
 		]
 }
\ No newline at end of file