Resolve conflict in doc/api/users.md

doc/api/users.md

@@ -328,16 +328,10 @@ Parameters:
 - `admin` (optional)               - User is admin - true or false (default)
 - `can_create_group` (optional)    - User can create groups - true or false
 - `skip_reconfirmation` (optional) - Skip reconfirmation - true or false (default)
-<<<<<<< HEAD
-- `external` (optional)         - Flags the user as external - true or false(default)
-- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
-- `avatar` (optional)           - Image file for user's avatar
-- `private_profile` (optional)  - User's profile is private - true or false
-=======
 - `external` (optional)            - Flags the user as external - true or false(default)
+- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
 - `avatar` (optional)              - Image file for user's avatar
 - `private_profile` (optional)     - User's profile is private - true or false
->>>>>>> upstream/master
 
 On password update, user will be forced to change it upon next login.
 Note, at the moment this method does only return a `404` error,