Projects >> wro4j >>271491aa7a0b96f89651a6d2f8dd5014686fcf63

Chunk
Conflicting content
      };
    };
    final Reader reader = new InputStreamReader(getClass().getResourceAsStream("lesscss/giveErrors.less"));
<<<<<<< HEAD
    processor.process(null, reader, new StringWriter());
=======
    final StringWriter writer = new StringWriter();
    processor.process(reader, writer);
>>>>>>> 67d418898d93ff4684041cb53d12da243d892ffc
  }
}
Solution content
      };
    };
    final Reader reader = new InputStreamReader(getClass().getResourceAsStream("lesscss/giveErrors.less"));
    processor.process(null, reader, new StringWriter());
  }
}
File
TestLessCssProcessor.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable