fix merge conflict

server/model/category_boards.go

@@ -9,7 +9,7 @@ type CategoryBoards struct {
 
 	// The IDs of boards in this category
 	// required: true
-	BoardIDs []string `json:"boardIDs"`
+	BoardMetadata []CategoryBoardMetadata `json:"boardMetadata"`
 
 	// The relative sort order of this board in its category
 	// required: true
@@ -19,4 +19,10 @@ type CategoryBoards struct {
 type BoardCategoryWebsocketData struct {
 	BoardID    string `json:"boardID"`
 	CategoryID string `json:"categoryID"`
+	Hidden     bool   `json:"hidden"`
+}
+
+type CategoryBoardMetadata struct {
+	BoardID string `json:"boardID"`
+	Hidden  bool   `json:"hidden"`
 }

server/model/properties.go

@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:generate mockgen -destination=mocks/propValueResolverMock.go -package mocks . PropValueResolver
+
 package model
 
 import (

server/model/version.go

@@ -53,7 +53,7 @@ var (
 
 // LogServerInfo logs information about the server instance.
 func LogServerInfo(logger mlog.LoggerIFace) {
-	logger.Info("FocalBoard Server",
+	logger.Info("Focalboard server",
 		mlog.String("version", CurrentVersion),
 		mlog.String("edition", Edition),
 		mlog.String("build_number", BuildNumber),