fix description about client library (#7634)

kubernetes · Apr 16, 2018 · 3385527 · 3385527
1 parent f8a1cd6
commit 3385527
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/docs/reference/index.md b/docs/reference/index.md
@@ -22,7 +22,13 @@ To call the Kubernetes API from a programming language, you can use
 client libraries:
 
 - [Kubernetes Go client library](https://github.com/kubernetes/client-go/)
+<<<<<<< HEAD
 - [Kubernetes Python client library](https://github.com/kubernetes-client/python)
+||||||| merged common ancestors
+- [Kubernetes Python client libary](https://github.com/kubernetes-incubator/client-python)
+=======
+- [Kubernetes Python client library](https://github.com/kubernetes-incubator/client-python)
+>>>>>>> fix description about client library (#7634)
 
 ## CLI Reference