fix merging errors

Signed-off-by: ibankov <[email protected]>

services/basic_types.proto

@@ -1212,15 +1212,10 @@ enum HederaFunctionality {
      */
     TokenReject = 92;
 
-    /**
-     * Transfer one or more token balances held by the requesting account to the treasury for each token type.
-     */
-    TokenReject = 93;
-
     /**
      * Airdrop one or more tokens to one or more accounts.
      */
-    TokenAirdrop = 94;
+    TokenAirdrop = 93;
 }
 
 /**

services/response_code.proto

@@ -1509,39 +1509,24 @@ enum ResponseCodeEnum {
    */
   TOKEN_REFERENCE_LIST_SIZE_LIMIT_EXCEEDED = 355;
 
-    /**
-     * The transaction attempted to use duplicate `TokenReference`.<br/>
-     * This affects `TokenReject` attempting to reject same token reference more than once.
-     */
-    TOKEN_REFERENCE_REPEATED = 353;
-
-    /**
-     * The account id specified as the owner in `TokenReject` is invalid or does not exist.
-     */
-    INVALID_OWNER_ID = 354;
 
-    /**
-     * The transaction attempted to use more than the allowed number of `TokenReference`.
-     */
-    TOKEN_REFERENCE_LIST_SIZE_LIMIT_EXCEEDED = 355;
-
-    /**
-     * The number of service endpoints exceeds the limit
-     */
-    SERVICE_ENDPOINTS_EXCEEDED_LIMIT = 356;
+  /**
+   * The number of service endpoints exceeds the limit
+   */
+  SERVICE_ENDPOINTS_EXCEEDED_LIMIT = 356;
 
-    /*
-     * The IPv4 address is invalid
-     */
-    INVALID_IPV4_ADDRESS = 357;
+  /*
+   * The IPv4 address is invalid
+   */
+  INVALID_IPV4_ADDRESS = 357;
 
-    /**
-     * The transaction attempted to use empty `TokenReference` list.
-     */
-    EMPTY_TOKEN_REFERENCE_LIST = 358;
+  /**
+   * The transaction attempted to use empty `TokenReference` list.
+   */
+  EMPTY_TOKEN_REFERENCE_LIST = 358;
 
-    /*
-     * The node account is not allowed to be updated
-     */
-    UPDATE_NODE_ACCOUNT_NOT_ALLOWED = 359;
+  /*
+   * The node account is not allowed to be updated
+   */
+  UPDATE_NODE_ACCOUNT_NOT_ALLOWED = 359;
 }