fixed merged conflict issue

Author: rg911

src/model/transaction/AggregateTransaction.ts

@@ -173,26 +173,6 @@ export class AggregateTransaction extends Transaction {
                                      this.type, this.networkType);
     }
 
-    /**
-     * @internal
-     * Sign transaction with cosignatories collected from cosigned transactions and creating a new SignedTransaction
-     * For off chain Aggregated Complete Transaction co-signing.
-     * @param initiatorAccount - Initiator account
-     * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction
-     * @param generationHash - Network generation hash hex
-     * @return {SignedTransaction}
-     */
-    public signTransactionGivenSignatures(initiatorAccount: Account,
-                                          cosignatureSignedTransactions: CosignatureSignedTransaction[],
-                                          generationHash: string) {
-        const aggregateTransaction = this.buildTransaction();
-        const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount,
-                                                                                         cosignatureSignedTransactions,
-                                                                                         generationHash);
-        return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey,
-                                     this.type, this.networkType);
-    }
-
     /**
      * Check if account has signed transaction
      * @param publicAccount - Signer public account