Projects >> fitnesse >>ba93d6f7249a94c4cb7cffa0ba724cb024bc8344

Chunk
Conflicting content 
 */
public class SuiteXmlReformatter extends BaseFormatter implements Closeable {

<<<<<<< HEAD
  private static final Logger LOG = Logger.getLogger(SuiteXmlReformatter.class.getName());

=======
  private final FitNesseContext context;
>>>>>>> e61874165af27c447cb8bf14399c389311e48460
  private final Writer writer;
  private final SuiteHistoryFormatter historyFormatter;
  private boolean includeHtml;
Solution content 
 */
public class SuiteXmlReformatter extends BaseFormatter implements Closeable {
  private static final Logger LOG = Logger.getLogger(SuiteXmlReformatter.class.getName());
  private final FitNesseContext context;
  private final Writer writer;
  private final SuiteHistoryFormatter historyFormatter;
  private boolean includeHtml;
File
SuiteXmlReformatter.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation