From 6eb9d324baa38641c8595a1e09af11d0026dad4d Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Fri, 19 Apr 2024 07:21:57 -0500
Subject: [PATCH] GH-14 Fix merge issue

---
 libraries/chain/include/eosio/chain/vote_processor.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/eosio/chain/vote_processor.hpp b/libraries/chain/include/eosio/chain/vote_processor.hpp
index 6db78e286e..c6078e148d 100644
--- a/libraries/chain/include/eosio/chain/vote_processor.hpp
+++ b/libraries/chain/include/eosio/chain/vote_processor.hpp
@@ -117,7 +117,7 @@ class vote_processor_t {
          auto bsp = get_block(v.msg->block_id, g);
          // g is unlocked
          if (bsp) {
-            vote_status s = bsp->aggregate_vote(*v.msg);
+            vote_status s = bsp->aggregate_vote(v.connection_id, *v.msg);
             emit(v.connection_id, s, v.msg);
 
             g.lock();
@@ -230,7 +230,7 @@ class vote_processor_t {
                g.lock();
                queue_for_later(connection_id, msg);
             } else {
-               vote_status s = bsp->aggregate_vote(*msg);
+               vote_status s = bsp->aggregate_vote(connection_id, *msg);
                emit(connection_id, s, msg);
 
                g.lock();