diff options
Diffstat (limited to 'src/appMain/hmi_capabilities.json')
| -rwxr-xr-x | src/appMain/hmi_capabilities.json | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 6000177321..417135fcb6 100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -324,39 +324,10 @@ "diagonalScreenSize": 8, "pixelPerInch": 117, "scale": 1 -<<<<<<< HEAD - }, - "seatLocationCapability": { - "rows": 2, - "columns": 3, - "levels": 1, - "seats": [ - { - "row": 0, - "col": 0, - "level": 0, - "rowspan": 1, - "levelspan": 1, - "colspan": 1 - } - ] }, "driverDistractionCapability": { "menuLength": 10, "subMenuDepth": 3 - }, - "remoteControlCapability": { - "buttonCapabilities": [ - { - "longPressAvailable": true, - "name": "AC_MAX", - "moduleInfo": { - "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb", - "allowMultipleAccess": false - }, - "shortPressAvailable": true, - "upDownAvailable": false -======= } } }, @@ -369,7 +340,6 @@ "moduleInfo": { "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb", "allowMultipleAccess": false ->>>>>>> origin/develop }, "shortPressAvailable": true, "upDownAvailable": false |