fixed merge issue

Author: rg911

src/model/transaction/AggregateTransaction.ts

@@ -96,7 +96,7 @@ export class AggregateTransaction extends Transaction {
      * @param {InnerTransaction[]} innerTransactions
      * @param {NetworkType} networkType
      * @param {AggregateTransactionCosignature[]} cosignatures
-     * @param {UInt64} maxFee - (Optional) Max fee defined by the sender
+     * @param {UInt64} maxFee - (Optional) Max fee defined by the sender
      * @return {AggregateTransaction}
      */
     public static createBonded(deadline: Deadline,
@@ -194,4 +194,4 @@ export class AggregateTransaction extends Transaction {
 
         return byteSize + byteTransactionsSize + byteTransactions;
     }
-}
+}

src/model/transaction/CosignatureTransaction.ts

@@ -79,4 +79,4 @@ export class CosignatureTransaction {
             signedTransactionRaw.signature,
             signedTransactionRaw.signer);
     }
-}
+}

test/model/transaction/AggregateTransaction.spec.ts

@@ -465,4 +465,4 @@ describe('AggregateTransaction', () => {
             expect(aggregateTransaction.size).to.be.equal(120 + 4 + 158);
         });
     });
-});
+});

test/model/transaction/CosignatureTransaction.spec.ts

@@ -15,7 +15,6 @@
  */
 
 import {expect} from 'chai';
-import { VerifiableTransaction } from 'nem2-library';
 import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO';
 import {Account} from '../../../src/model/account/Account';
 import { NetworkType } from '../../../src/model/blockchain/NetworkType';
@@ -130,4 +129,4 @@ describe('CosignatureTransaction', () => {
         expect(signedTx.signer).to.be.equal('C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE');
         expect(signedTx.signer).to.be.equal(account.publicKey);
     });
-});
+});