From 406cc54299354cf03ded79e6f92ef3223652a1eb Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Thu, 3 Sep 2020 17:15:04 -0500
Subject: [PATCH] Ref #381: Fix bad merge

During merge conflict resolution, I accidentally broke custom
authorities. This fixes it.
---
 libraries/chain/protocol/transaction.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp
index b31c6795..0ca5cd94 100644
--- a/libraries/chain/protocol/transaction.cpp
+++ b/libraries/chain/protocol/transaction.cpp
@@ -280,7 +280,8 @@ void verify_authority( const vector<operation>& ops, const flat_set<public_key_t
 
    for( const auto& op : ops ) {
       flat_set<account_id_type> operation_required_active;
-      operation_get_required_authorities( op, required_active, required_owner, other, ignore_custom_operation_required_auths );
+      operation_get_required_authorities( op, operation_required_active, required_owner, other,
+                                          ignore_custom_operation_required_auths );
 
       auto itr = operation_required_active.begin();
       while ( itr != operation_required_active.end() ) {