cluster setup script HA

d86f8baa · Your Name · b14ef11d · d0875940 · d86f8baa
Commit d86f8baa authored Mar 15, 2022 by Your Name
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

README.md README.md +7 -0

No files found.
--- a/README.md
+++ b/README.md
 # ROS-Kubernetes

+<<<<<<< HEAD
 Contains scrips and files to create a fielded ros kubernetes cluster.

 # Table of Contents:
@@ -18,6 +19,12 @@ Contains scrips and files to create a fielded ros kubernetes cluster.
  * [Imaging ROS Test](#imaging-ros-test)
  * [Handy Troubleshooting Commands](#handy-troubleshooting-commands)
  * [Links With More Information](#links-with-more-information)
+=======
+Contains scrips and files to create a fielded ros kubernetes cluster.  
+[[_TOC_]]
+ToC
+[TOC]
+>>>>>>> d0875940780175e3deab768c56dbde948bc0adee

 ## Image building