Merge pull request #323 from abedelaziz-deriv/resolve_conflict

Author: abedelaziz-deriv

lib/api/models/reset_pass_model.dart

@@ -7,4 +7,4 @@ abstract class ResetPasswordModel {
 
   /// `true`: password reset success, `false`: password reset failure
   final bool resetPassword;
-}
+}

lib/api/response/account_list_response_result.dart

@@ -106,6 +106,7 @@ enum PlatformEnum {
   /// mt5.
   mt5,
 }
+
 /// Account list item model class.
 abstract class AccountListItemModel {
   /// Initializes Account list item model class .
@@ -240,6 +241,7 @@ class AccountListItem extends AccountListItemModel {
         broker: broker ?? this.broker,
       );
 }
+
 /// Linked to item model class.
 abstract class LinkedToItemModel {
   /// Initializes Linked to item model class .

lib/api/response/account_security_response_result.dart

@@ -51,6 +51,7 @@ class AccountSecurityResponse extends AccountSecurityResponseModel {
         accountSecurity: accountSecurity ?? this.accountSecurity,
       );
 }
+
 /// Account security model class.
 abstract class AccountSecurityModel {
   /// Initializes Account security model class .
@@ -94,6 +95,7 @@ class AccountSecurity extends AccountSecurityModel {
         totp: totp ?? this.totp,
       );
 }
+
 /// Totp model class.
 abstract class TotpModel {
   /// Initializes Totp model class .

lib/api/response/account_statistics_response_result.dart

@@ -51,6 +51,7 @@ class AccountStatisticsResponse extends AccountStatisticsResponseModel {
         accountStatistics: accountStatistics ?? this.accountStatistics,
       );
 }
+
 /// Account statistics model class.
 abstract class AccountStatisticsModel {
   /// Initializes Account statistics model class .

lib/api/response/active_symbols_response_result.dart

@@ -86,6 +86,7 @@ class ActiveSymbolsResponse extends ActiveSymbolsResponseModel {
         activeSymbols: activeSymbols ?? this.activeSymbols,
       );
 }
+
 /// Active symbols item model class.
 abstract class ActiveSymbolsItemModel {
   /// Initializes Active symbols item model class .

lib/api/response/affiliate_account_add_response_result.dart

@@ -53,6 +53,7 @@ class AffiliateAccountAddResponse extends AffiliateAccountAddResponseModel {
         affiliateAccountAdd: affiliateAccountAdd ?? this.affiliateAccountAdd,
       );
 }
+
 /// Affiliate account add model class.
 abstract class AffiliateAccountAddModel {
   /// Initializes Affiliate account add model class .

lib/api/response/affiliate_add_company_response_result.dart

@@ -51,6 +51,7 @@ class AffiliateAddCompanyResponse extends AffiliateAddCompanyResponseModel {
         affiliateAddCompany: affiliateAddCompany ?? this.affiliateAddCompany,
       );
 }
+
 /// Affiliate add company model class.
 abstract class AffiliateAddCompanyModel {
   /// Initializes Affiliate add company model class .

lib/api/response/affiliate_add_person_response_result.dart

@@ -51,6 +51,7 @@ class AffiliateAddPersonResponse extends AffiliateAddPersonResponseModel {
         affiliateAddPerson: affiliateAddPerson ?? this.affiliateAddPerson,
       );
 }
+
 /// Affiliate add person model class.
 abstract class AffiliateAddPersonModel {
   /// Initializes Affiliate add person model class .

lib/api/response/api_token_response_result.dart

@@ -132,6 +132,7 @@ enum ScopesItemEnum {
   /// admin.
   admin,
 }
+
 /// Api token model class.
 abstract class ApiTokenModel {
   /// Initializes Api token model class .
@@ -202,6 +203,7 @@ class ApiToken extends ApiTokenModel {
         tokens: tokens ?? this.tokens,
       );
 }
+
 /// Tokens item model class.
 abstract class TokensItemModel {
   /// Initializes Tokens item model class .

lib/api/response/app_get_response_result.dart

@@ -184,6 +184,7 @@ class AppGetResponse extends AppGetResponseModel {
         appGet: appGet ?? this.appGet,
       );
 }
+
 /// App get model class.
 abstract class AppGetModel {
   /// Initializes App get model class .