kubernetes
/
community
mirror of https://github.com/kubernetes/community.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api-conventions: fix leftover merge conflict mark 

This seems to be a leftover.
This commit is contained in:
Ahmet Alp Balkan 2022-08-21 22:56:17 -07:00 committed by GitHub
parent a329a26b15
commit 5ba422e1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors/devel/sig-architecture/api-conventions.md
View File

@ -1995,4 +1995,3 @@ need human evaluation to decide. For example, Service `clusterIP` is highly
coupled to the rest of Service and most instances use it. But it also is
strictly optional and has an increasingly complicated schema of related fields.
An argument could be made for either path.
>>>>>>> 49012588 (Loosen the meaning of status in API conventions)