From 2232d568b7d19bf45073b17b0df017970862f92f Mon Sep 17 00:00:00 2001 From: Andy Munro Date: Thu, 18 Mar 2021 15:09:10 -0400 Subject: [PATCH] Reworked chapter 1, the overview chapter --- server_admin/topics/overview.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server_admin/topics/overview.adoc b/server_admin/topics/overview.adoc index 4acc0e959a..3d8914c27b 100644 --- a/server_admin/topics/overview.adoc +++ b/server_admin/topics/overview.adoc @@ -1,8 +1,12 @@ <<<<<<< HEAD +<<<<<<< HEAD == {project_name} features and concepts ======= == Features and Concepts for {project_name} >>>>>>> Rework server initialization chapter +======= +== {project_name} features and concepts +>>>>>>> Reworked chapter 1, the overview chapter {project_name} is a single sign on solution for web apps and RESTful web services. The goal of {project_name} is to make security simple so that it is easy for application developers to secure the apps and services they have deployed