Remove extra newline

bryphe-coder · bryphe-coder · commit 9cb53dd5e63d · 2022-02-09T04:21:13.000Z
diff --git a/coderd/projects.go b/coderd/projects.go
@@ -58,11 +58,9 @@ func (api *api) projects(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-
 	if projects == nil {
 		projects = []database.Project{}
 	}
-	
 	render.Status(r, http.StatusOK)
 	render.JSON(rw, r, projects)
 }
@@ -80,17 +78,9 @@ func (api *api) projectsByOrganization(rw http.ResponseWriter, r *http.Request)
 		})
 		return
 	}
-<<<<<<< HEAD
-	// Don't return 'null'
-	if projects == nil {
-		projects = []database.Project{}
-	}
-||||||| 2afad8b
-=======
 	if projects == nil {
 		projects = []database.Project{}
 	}
->>>>>>> main
 	render.Status(r, http.StatusOK)
 	render.JSON(rw, r, projects)
 }

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,9 @@ func (api api) projects(rw http.ResponseWriter, r http.Request) {`
`58`	`58`	`})`
`59`	`59`	`return`
`60`	`60`	`}`
`61`		`-`
`62`	`61`	`if projects == nil {`
`63`	`62`	`projects = []database.Project{}`
`64`	`63`	`}`
`65`		`-`
`66`	`64`	`render.Status(r, http.StatusOK)`
`67`	`65`	`render.JSON(rw, r, projects)`
`68`	`66`	`}`
`@@ -80,17 +78,9 @@ func (api api) projectsByOrganization(rw http.ResponseWriter, r http.Request)`
`80`	`78`	`})`
`81`	`79`	`return`
`82`	`80`	`}`
`83`		`-<<<<<<< HEAD`
`84`		`- // Don't return 'null'`
`85`		`- if projects == nil {`
`86`		`- projects = []database.Project{}`
`87`		`- }`
`88`		`-\|\|\|\|\|\|\| 2afad8b`
`89`		`-=======`
`90`	`81`	`if projects == nil {`
`91`	`82`	`projects = []database.Project{}`
`92`	`83`	`}`
`93`		`->>>>>>> main`
`94`	`84`	`render.Status(r, http.StatusOK)`
`95`	`85`	`render.JSON(rw, r, projects)`
`96`	`86`	`}`