|
@@ -4,11 +4,7 @@
|
|
|
|
|
|
|
|
- [Requirements](#requirements)
|
|
- [Requirements](#requirements)
|
|
|
- [Installation](#installation)
|
|
- [Installation](#installation)
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-- [Server Configuration: Why Public?](#server-configuration)
|
|
|
|
|
-=======
|
|
|
|
|
- [Server Configuration](#server-configuration)
|
|
- [Server Configuration](#server-configuration)
|
|
|
->>>>>>> feature/docs-install
|
|
|
|
|
- [Basic Configuration](#basic-configuration)
|
|
- [Basic Configuration](#basic-configuration)
|
|
|
- [Environments](#environments)
|
|
- [Environments](#environments)
|
|
|
- [Cleaner URLs](#cleaner-urls)
|
|
- [Cleaner URLs](#cleaner-urls)
|
Shawn McCool