| Chunk |
|---|
| Conflicting content |
|---|
extends JsTemplateCompilerProcessor {
public static final String ALIAS = "handlebarsJs";
<<<<<<< HEAD
=======
>>>>>>> 8af5bd864da6bbf4d49454919e3da0ad78866de5
/**
* {@inheritDoc}
*/ |
| Solution content |
|---|
extends JsTemplateCompilerProcessor {
public static final String ALIAS = "handlebarsJs";
/**
* {@inheritDoc}
*/ |
| File |
|---|
| HandlebarsJsProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |