Class N2oConfigConflictParser
- java.lang.Object
-
- net.n2oapp.framework.config.register.audit.util.N2oConfigConflictParser
-
public class N2oConfigConflictParser extends Object
- Since:
- 12.08.2015
- Author:
- dfirstov
-
-
Field Summary
Fields Modifier and Type Field Description static StringFINISH_LINE_CONFLICTstatic StringMIDDLE_LINE_CONFLICTstatic StringREGEX_LINE_ENDstatic StringSTART_LINE_CONFLICT
-
Constructor Summary
Constructors Constructor Description N2oConfigConflictParser()
-
Method Summary
All Methods Static Methods Concrete Methods Modifier and Type Method Description static N2oConfigConflictrestoreContentsByConflict(N2oConfigConflict configConflict)
-
-
-
Field Detail
-
REGEX_LINE_END
public static final String REGEX_LINE_END
- See Also:
- Constant Field Values
-
START_LINE_CONFLICT
public static final String START_LINE_CONFLICT
- See Also:
- Constant Field Values
-
MIDDLE_LINE_CONFLICT
public static final String MIDDLE_LINE_CONFLICT
- See Also:
- Constant Field Values
-
FINISH_LINE_CONFLICT
public static final String FINISH_LINE_CONFLICT
- See Also:
- Constant Field Values
-
-
Method Detail
-
restoreContentsByConflict
public static N2oConfigConflict restoreContentsByConflict(N2oConfigConflict configConflict)
-
-