Fix merge conflicts for new GPS tracking system (!192) · Merge requests · entgra / carbon-device-mgt-plugins · GitLab

Rushdi Mohamed requested to merge rushdi-entgra.io/carbon-device-mgt-plugins:master into master May 30, 2022

Purpose

Fix merge conflicts of carbon device-mgt implementing method on

Goals

implement method

Approach

N/A

Documentation

N/A

Automation tests

N/A

Security checks

Followed secure coding standards? yes
Ran FindSecurityBugs plugin and verified report? yes
Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? yes

Related MRs

carbon-device-mgt!899 (merged) emm-proprietary-plugins!837

Test environment

Ubuntu server 20.04

Learning

N/A