Skip to content
Snippets Groups Projects
Commit 93153c9f authored by Hüseyin Mert's avatar Hüseyin Mert Committed by Knative Prow Robot
Browse files

Conflict message removed. (#1135)

parent de254fc6
No related branches found
No related tags found
No related merge requests found
......@@ -158,11 +158,7 @@ Knative depends on Istio.
about an unknown type, run the second `kubectl apply` command again.
1. Label the default namespace with `istio-injection=enabled`:
<<<<<<< HEAD
=======
>>>>>>> 4db0a43... #fixitfriday website rendering for GKE install (#1115)
```bash
kubectl label namespace default istio-injection=enabled
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment