Resolve doc/api/users.md

43c87a2f · Lin Jen-Shin · 6b37f335 · 43c87a2f
Commit 43c87a2f authored Jul 25, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/api/users.md doc/api/users.md +0 -3

No files found.
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -295,10 +295,7 @@ Parameters:
 - `external` (optional)          - Flags the user as external - true or false(default)
 - `avatar` (optional)            - Image file for user's avatar
 - `private_profile` (optional)   - User's profile is private - true or false
-<<<<<<< HEAD
 - `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
-=======
->>>>>>> upstream/master

 ## User modification