From c2c1e783e70a3439e80868fca40e72b5e0b2f08b Mon Sep 17 00:00:00 2001
From: Sandip Patel <sandip@knackroot.com>
Date: Tue, 5 Nov 2019 13:40:09 +0530
Subject: [PATCH] Fixed merge issue

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

diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp
index 55168c64..52cfdd8b 100644
--- a/libraries/chain/include/graphene/chain/database.hpp
+++ b/libraries/chain/include/graphene/chain/database.hpp
@@ -527,8 +527,8 @@ namespace graphene { namespace chain {
          public:
             double calculate_vesting_factor(const account_object& stake_account);
 
-         template<class... Types>
-         void perform_account_maintenance(std::tuple<Types...> helpers);
+         template<class Type>
+         void perform_account_maintenance(Type tally_helper);
          ///@}
          ///@}