Corrected merges usage to prevent possible conflicts with other plugins #1538

Merged
merged 1 commit into from Jan 20, 2017

Projects

None yet

2 participants

@daserge
Contributor
daserge commented Jan 20, 2017

See https://issues.apache.org/jira/browse/CB-12353 for details

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
@macdonst macdonst merged commit 00c67cb into phonegap:master Jan 20, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment