Fixed merged conflic issues

Author: rg911

src/model/transaction/AddressAliasTransaction.ts

@@ -184,20 +184,4 @@ export class AddressAliasTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedAddressAliasTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.ADDRESS_ALIAS.valueOf(),
-            this.actionType.valueOf(),
-            new NamespaceIdDto(this.namespaceId.id.toDTO()),
-            new AddressDto(RawAddress.stringToAddress(this.address.plain())),
-        );
-        return transactionBuilder.serialize();
-    }
 }

src/model/transaction/ModifyMultisigAccountTransaction.ts

@@ -206,25 +206,4 @@ export class ModifyMultisigAccountTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedMultisigAccountModificationTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.MODIFY_MULTISIG_ACCOUNT.valueOf(),
-            this.minRemovalDelta,
-            this.minApprovalDelta,
-            this.modifications.map((modification) => {
-                return new CosignatoryModificationBuilder(
-                    modification.type.valueOf(),
-                    new KeyDto(Convert.hexToUint8(modification.cosignatoryPublicAccount.publicKey)),
-                );
-            }),
-        );
-        return transactionBuilder.serialize();
-    }
 }

src/model/transaction/MosaicAliasTransaction.ts

@@ -179,20 +179,4 @@ export class MosaicAliasTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedMosaicAliasTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.MOSAIC_ALIAS.valueOf(),
-            this.actionType.valueOf(),
-            new NamespaceIdDto(this.namespaceId.id.toDTO()),
-            new MosaicIdDto(this.mosaicId.id.toDTO()),
-        );
-        return transactionBuilder.serialize();
-    }
 }