Merge branch 'MRELEASE-835' of https://github.com/theit/maven-release …

…into MRELEASE-835
apache · Jun 28, 2018 · 6572a69 · 6572a69
2 parents 796b08d + 9ab9630
commit 6572a69
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -751,7 +751,6 @@
 
         ModelloReleaseDescriptor that = (ModelloReleaseDescriptor) obj;
 
-<<<<<<< HEAD
         if ( updateDependencies                  != that.isUpdateDependencies()               ||
              useReleaseProfile                   != that.isUseReleaseProfile()                ||
              autoVersionSubmodules               != that.isAutoVersionSubmodules()            ||
@@ -767,23 +766,6 @@
              localCheckout                       != that.isLocalCheckout()                    ||
              pushChanges                         != that.isPushChanges()                      ||
              autoResolveSnapshotDependencies     != that.autoResolveSnapshotDependencies      ||
-=======
-        if ( updateDependencies               != that.isUpdateDependencies()               ||
-             useReleaseProfile                != that.isUseReleaseProfile()                ||
-             autoVersionSubmodules            != that.isAutoVersionSubmodules()            ||
-             snapshotReleasePluginAllowed     != that.isSnapshotReleasePluginAllowed()     ||
-             commitByProject                  != that.isCommitByProject()                  ||
-             branchCreation                   != that.isBranchCreation()                   ||
-             updateBranchVersions             != that.isUpdateBranchVersions()             ||
-             updateWorkingCopyVersions        != that.isUpdateWorkingCopyVersions()        ||
-             suppressCommitBeforeTagOrBranch  != that.isSuppressCommitBeforeTagOrBranch()  ||
-             updateVersionsToSnapshot         != that.isUpdateVersionsToSnapshot()         ||
-             allowTimestampedSnapshots        != that.isAllowTimestampedSnapshots()        ||
-             remoteTagging                    != that.isRemoteTagging()                    ||
-             localCheckout                    != that.isLocalCheckout()                    ||
-             pushChanges                      != that.isPushChanges()                      ||
-             autoResolveSnapshotDependencies     != that.autoResolveSnapshotDependencies     ||
->>>>>>> [MRELEASE-998] Add ability to create custom phases
              autoResolveSnapshotDependenciesMode != that.autoResolveSnapshotDependenciesMode
            )
            {