fix merge
This commit is contained in:
parent
a66eb44809
commit
ee6adc26d9
@ -4,11 +4,7 @@
|
||||
|
||||
- [Requirements](#requirements)
|
||||
- [Installation](#installation)
|
||||
<<<<<<< HEAD
|
||||
- [Server Configuration: Why Public?](#server-configuration)
|
||||
=======
|
||||
- [Server Configuration](#server-configuration)
|
||||
>>>>>>> feature/docs-install
|
||||
- [Basic Configuration](#basic-configuration)
|
||||
- [Environments](#environments)
|
||||
- [Cleaner URLs](#cleaner-urls)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user