More

Author: mjang

content/nginx-one/nginx-configs/_index.md

@@ -5,6 +5,7 @@ description:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Manage your NGINX instances
 =======
 title: Organize your NGINX instances
@@ -21,6 +22,9 @@ title: Manage your NGINX instances
 =======
 title: Add and manage your NGINX instances
 >>>>>>> f6a622d3 (More)
+=======
+title: Add and manage NGINX instances
+>>>>>>> 2fec8a44 (More)
 weight: 300
 url: /nginx-one/nginx-configs
 ---

content/nginx-one/staged-configs/_index.md

@@ -3,6 +3,7 @@ description:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 title: Draft new configurations
 weight: 400
 url: /nginx-one/staged-configs
@@ -14,6 +15,9 @@ title: Draft new instances
 =======
 title: Draft new instances (Staged Configuration)
 >>>>>>> 4da8aa7e (based on Jason's feedback)
+=======
+title: Draft new instances (Staged Configs)
+>>>>>>> 2fec8a44 (More)
 weight: 200
 url: /nginx-one/how-to/staged-configs
 >>>>>>> c7ce27ce (Draft: new N1C doc homepage)