Skip to content

Commit 45d4276

Browse files
committed
Remove additional bad merge conflict resolution
Signed-off-by: Max Smythe <[email protected]>
1 parent 425db6b commit 45d4276

File tree

1 file changed

+0
-2
lines changed
  • keps/sig-api-machinery/3488-cel-admission-control

1 file changed

+0
-2
lines changed

keps/sig-api-machinery/3488-cel-admission-control/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,8 +1012,6 @@ However, enforcing types for every expression and object is not feasible because
10121012

10131013
Problem examples:
10141014

1015-
create mode 100644 keps/sig-network/3458-remove-transient-node-predicates-from-service-controller/README.md
1016-
10171015
| Problem | Summary |
10181016
|--------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
10191017
| version skew: ephemeralContainers case | New pod field, need to be able to validate in same was containers and initContainers if field exists and is populated |

0 commit comments

Comments
 (0)