Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
  • C carbon-device-mgt-plugins
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Service Desk
    • Milestones
    • Requirements
  • Merge requests 2
    • Merge requests 2
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • entgraentgra
  • carbon-device-mgt-plugins
  • Merge requests
  • !192

Fix merge conflicts for new GPS tracking system

  • Review changes

  • Download
  • Email patches
  • Plain diff
Open Rushdi Mohamed requested to merge rushdi-entgra.io/carbon-device-mgt-plugins:master into master May 30, 2022
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 1

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 emm-proprietary-plugins!837

Test environment

Ubuntu server 20.04

Learning

N/A

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: master