Build App list and docs

template/portainer-v2-amd64.json

@@ -3703,29 +3703,6 @@
 					"default": "4011",
 					"label": "KASM_PORT",
 					"name": "KASM_PORT"
-<<<<<<< HEAD
-=======
-				},
-				{
-					"default": "",
-					"label": "DOCKER_HUB_USERNAME",
-					"name": "DOCKER_HUB_USERNAME"
-				},
-				{
-					"default": "",
-					"label": "DOCKER_HUB_PASSWORD",
-					"name": "DOCKER_HUB_PASSWORD"
-				},
-				{
-					"default": "",
-					"label": "MODPROBE_CMD",
-					"name": "MODPROBE_CMD"
-				},
-				{
-					"default": "",
-					"label": "OTLP_ENDPOINT",
-					"name": "OTLP_ENDPOINT"
->>>>>>> a60261a762f8757a6752778edab6b918bb2de4e8
 				}
 			],
 			"image": "lscr.io/linuxserver/kasm:latest",

template/portainer-v2-arm64.json

@@ -3685,29 +3685,6 @@
 					"default": "4011",
 					"label": "KASM_PORT",
 					"name": "KASM_PORT"
-<<<<<<< HEAD
-=======
-				},
-				{
-					"default": "",
-					"label": "DOCKER_HUB_USERNAME",
-					"name": "DOCKER_HUB_USERNAME"
-				},
-				{
-					"default": "",
-					"label": "DOCKER_HUB_PASSWORD",
-					"name": "DOCKER_HUB_PASSWORD"
-				},
-				{
-					"default": "",
-					"label": "MODPROBE_CMD",
-					"name": "MODPROBE_CMD"
-				},
-				{
-					"default": "",
-					"label": "OTLP_ENDPOINT",
-					"name": "OTLP_ENDPOINT"
->>>>>>> a60261a762f8757a6752778edab6b918bb2de4e8
 				}
 			],
 			"image": "lscr.io/linuxserver/kasm:latest",