From 47baec05892e76962fcccc666841d2447aef92f6 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 28 Aug 2016 17:51:42 +0300 Subject: [PATCH] raspberrypi3: boardctl.py merge conflict fix --- board/raspberrypi3/motioneye-modules/boardctl.py | 1 + 1 file changed, 1 insertion(+) diff --git a/board/raspberrypi3/motioneye-modules/boardctl.py b/board/raspberrypi3/motioneye-modules/boardctl.py index 27f208d912..9fdfa06e54 100644 --- a/board/raspberrypi3/motioneye-modules/boardctl.py +++ b/board/raspberrypi3/motioneye-modules/boardctl.py @@ -135,6 +135,7 @@ def _set_board_settings(s): if name == 'gpu_mem': lines[i] = '%s=%s' % (name, s['gpuMem']) + elif name == 'disable_camera_led': lines[i] = 'disable_camera_led=%s' % ['1', '0'][s['cameraLed']]