Update config sample and collab doc (#3039)

removing some old example and add info about the mastermerge label

---------

Co-authored-by: veeck <michael@veeck.de>

CHANGELOG.md

@@ -27,7 +27,7 @@ _This release is scheduled to be released on 2023-04-01._
 ### Updated
 
 - Use develop as target branch for dependabot
-- Update issue template and contributing doc
+- Update issue template, contributing doc and sample config
 - The weather modules clearly separates precipitation amount and probability (risk of rain/snow)
   - This requires all providers that only supports probability to change the config from `showPrecipitationAmount` to `showPrecipitationProbability`.
 - Update tests for weather and calendar module

Collaboration.md

@@ -6,6 +6,7 @@ This document describes how collaborators of this repository should work togethe
 - never merge without someone having approved (approving and merging from same person is allowed)
 - wait for all approvals requested (or the author decides something different in the comments)
 - never merge to `master`, except for releases (because of update notification)
+- merges to master should be tagged with the "mastermerge" label so that the test runs through
 
 ## Issues
 

config/config.js.sample

@@ -35,11 +35,6 @@ let config = {
 	logLevel: ["INFO", "LOG", "WARN", "ERROR"], // Add "DEBUG" for even more logging
 	timeFormat: 24,
 	units: "metric",
-	// serverOnly:  true/false/"local" ,
-	// local for armv6l processors, default
-	//   starts serveronly and then starts chrome browser
-	// false, default for all NON-armv6l devices
-	// true, force serveronly mode, because you want to.. no UI on this device
 
 	modules: [
 		{