Skip to content

Commit 7c1b533

Browse files
author
Steven Smith
committed
Adds build API endpoints
1 parent fe8c8ac commit 7c1b533

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

api/master.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,8 @@ include::modules/managing-teams-api.adoc[leveloffset=+2]
127127
include::modules/managing-team-members-api.adoc[leveloffset=+3]
128128
include::modules/setting-role-of-team-within-organization-api.adoc[leveloffset=+3]
129129
include::modules/deleting-team-within-organization-api.adoc[leveloffset=+3]
130-
<<<<<<< HEAD
131130
//build
132131
include::modules/managing-builds-api.adoc[leveloffset=+2]
133-
=======
134-
>>>>>>> 73048c92 (Adds user api endpoints (#1229))
135132
//user
136133
include::modules/managing-user-options-api.adoc[leveloffset=+2]
137134

0 commit comments

Comments
 (0)