Auto resolve conflict by keeping our changes

Author: box-sdk-build

docs/sdkgen/users.md

@@ -196,9 +196,9 @@ Returns the updated user object.
 
 ## Delete user
 
-Deletes a user. By default this will fail if the user
-still owns any content. Move their owned content first
-before proceeding, or use the `force` field to delete
+Deletes a user. By default, this operation fails if the user
+still owns any content, was recently active, or recently joined the enterprise from a free account. 
+To proceed, move their owned content first, or use the `force` parameter to delete
 the user and their files.
 
 This operation is performed by calling function `deleteUserById`.

src/main/java/com/box/sdkgen/managers/users/DeleteUserByIdQueryParams.java

@@ -5,7 +5,10 @@ public class DeleteUserByIdQueryParams {
   /** Whether the user will receive email notification of the deletion. */
   public Boolean notify;
 
-  /** Whether the user should be deleted even if this user still own files. */
+  /**
+   * Specifies whether to delete the user even if they still own files, were recently active, or
+   * recently joined the enterprise from a free account.
+   */
   public Boolean force;
 
   public DeleteUserByIdQueryParams() {}

src/main/java/com/box/sdkgen/managers/users/UsersManager.java

@@ -477,8 +477,9 @@ public UserFull updateUserById(
   }
 
   /**
-   * Deletes a user. By default this will fail if the user still owns any content. Move their owned
-   * content first before proceeding, or use the `force` field to delete the user and their files.
+   * Deletes a user. By default, this operation fails if the user still owns any content, was
+   * recently active, or recently joined the enterprise from a free account. To proceed, move their
+   * owned content first, or use the `force` parameter to delete the user and their files.
    *
    * @param userId The ID of the user. Example: "12345"
    */
@@ -487,8 +488,9 @@ public void deleteUserById(String userId) {
   }
 
   /**
-   * Deletes a user. By default this will fail if the user still owns any content. Move their owned
-   * content first before proceeding, or use the `force` field to delete the user and their files.
+   * Deletes a user. By default, this operation fails if the user still owns any content, was
+   * recently active, or recently joined the enterprise from a free account. To proceed, move their
+   * owned content first, or use the `force` parameter to delete the user and their files.
    *
    * @param userId The ID of the user. Example: "12345"
    * @param queryParams Query parameters of deleteUserById method
@@ -498,8 +500,9 @@ public void deleteUserById(String userId, DeleteUserByIdQueryParams queryParams)
   }
 
   /**
-   * Deletes a user. By default this will fail if the user still owns any content. Move their owned
-   * content first before proceeding, or use the `force` field to delete the user and their files.
+   * Deletes a user. By default, this operation fails if the user still owns any content, was
+   * recently active, or recently joined the enterprise from a free account. To proceed, move their
+   * owned content first, or use the `force` parameter to delete the user and their files.
    *
    * @param userId The ID of the user. Example: "12345"
    * @param headers Headers of deleteUserById method
@@ -509,8 +512,9 @@ public void deleteUserById(String userId, DeleteUserByIdHeaders headers) {
   }
 
   /**
-   * Deletes a user. By default this will fail if the user still owns any content. Move their owned
-   * content first before proceeding, or use the `force` field to delete the user and their files.
+   * Deletes a user. By default, this operation fails if the user still owns any content, was
+   * recently active, or recently joined the enterprise from a free account. To proceed, move their
+   * owned content first, or use the `force` parameter to delete the user and their files.
    *
    * @param userId The ID of the user. Example: "12345"
    * @param queryParams Query parameters of deleteUserById method