diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2022-08-22 11:04:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 11:04:28 -0700 |
| commit | 70cf83e287be7cab622d37534668f5e484b1d7dd (patch) | |
| tree | d73f01f9d52a045710f00159b80a2bd7e55d3428 | |
| parent | a329a26b1551046a0a48a0ef22d69739b3141933 (diff) | |
| parent | 5ba422e1aa0b1d89aa0f60414c1c6e7ff98e9e15 (diff) | |
Merge pull request #6820 from ahmetb/patch-1
api-conventions: fix leftover merge conflict mark
| -rw-r--r-- | contributors/devel/sig-architecture/api-conventions.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contributors/devel/sig-architecture/api-conventions.md b/contributors/devel/sig-architecture/api-conventions.md index c5ae218b..baf8d64e 100644 --- a/contributors/devel/sig-architecture/api-conventions.md +++ b/contributors/devel/sig-architecture/api-conventions.md @@ -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) |