fix merge conflict

matifali · matifali · commit 86bff3f1a4f2 · 2023-10-16T19:10:26.000Z
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1,5 +1,7 @@
 {
-  "versions": ["main"],
+  "versions": [
+    "main"
+  ],
   "routes": [
     {
       "title": "About",
@@ -229,11 +231,11 @@
           "state": "alpha"
         },
         {
-<<<<<<< HEAD
           "title": "Troubleshooting templates",
           "description": "Fix common template problems",
           "path": "./templates/troubleshooting.md"
-=======
+        },
+        {
           "title": "Terraform Modules",
           "description": "Reuse code across Coder templates",
           "path": "./templates/modules.md"
@@ -248,7 +250,6 @@
           "title": "Icons",
           "description": "Coder includes icons for popular cloud providers and programming languages for you to use",
           "path": "./templates/icons.md"
->>>>>>> main
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`		`- "versions": ["main"],`
	`2`	`+ "versions": [`
	`3`	`+ "main"`
	`4`	`+ ],`
`3`	`5`	`"routes": [`
`4`	`6`	`{`
`5`	`7`	`"title": "About",`
`@@ -229,11 +231,11 @@`
`229`	`231`	`"state": "alpha"`
`230`	`232`	`},`
`231`	`233`	`{`
`232`		`-<<<<<<< HEAD`
`233`	`234`	`"title": "Troubleshooting templates",`
`234`	`235`	`"description": "Fix common template problems",`
`235`	`236`	`"path": "./templates/troubleshooting.md"`
`236`		`-=======`
	`237`	`+ },`
	`238`	`+ {`
`237`	`239`	`"title": "Terraform Modules",`
`238`	`240`	`"description": "Reuse code across Coder templates",`
`239`	`241`	`"path": "./templates/modules.md"`
`@@ -248,7 +250,6 @@`
`248`	`250`	`"title": "Icons",`
`249`	`251`	`"description": "Coder includes icons for popular cloud providers and programming languages for you to use",`
`250`	`252`	`"path": "./templates/icons.md"`
`251`		`->>>>>>> main`
`252`	`253`	`}`
`253`	`254`	`]`
`254`	`255`	`},`