Change-Id: I310bc2093571bf22a58106f09706cc3eb43a2453 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v0.12.1
@@ -124,7 +124,7 @@ public class CherryPickResult { | |||
* A <code>CherryPickResult</code> with status | |||
* {@link CherryPickStatus#CONFLICTING} | |||
*/ | |||
public static CherryPickResult CONFLICT = new CherryPickResult( | |||
public static final CherryPickResult CONFLICT = new CherryPickResult( | |||
CherryPickStatus.CONFLICTING); | |||
/** |