Documentation tweaks

kubernetes · Oct 23, 2016 · e9e4a96 · e9e4a96
1 parent a45c670
commit e9e4a96
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/docs/topology.md b/docs/topology.md
@@ -29,25 +29,13 @@ kops create cluster ... --topology public|private|hybrid1
 The topology definition in the kops configuration is as follows
 
 ```
-<<<<<<< ae0e3556942559b69ba4575b00597496da677cdf
 topology:
     type: public|private|hybrid1
-=======
-
-
-## Topology Configuration
-
-The topology definition in the kops configuration is as follows
-
-```
-topology:
-    type: private|public|hybrid1
 ```
 
 Where kops will default to a public topology
 
 ```
 topology:
     type: public
->>>>>>> Abstracting models, and adding documention on the new topology directive
 ```