| Chunk |
|---|
| Conflicting content |
|---|
private boolean outline = false;
private int indentAmount = 1;
private Syntax syntax = Syntax.html;
<<<<<<< HEAD
private boolean updateMetaCharset = false;
=======
private Document document;
>>>>>>> c0325891a1b7f8e101593b42b8b3c75fff73643b
public OutputSettings() {
this(null); |
| Solution content |
|---|
private boolean outline = false;
private int indentAmount = 1;
private Syntax syntax = Syntax.html;
private boolean updateMetaCharset = false;
|
| File |
|---|
| Document.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |