Projects >> java_lab >>fae0e1a84d132c3db7b94db75b6fe70ffcbe2e0c

Chunk
Conflicting content
public class TreeNode {
    public int val;
<<<<<<< HEAD
    TreeNode left;
    TreeNode right;
=======
    public TreeNode left;
    public TreeNode right;
>>>>>>> 9158ef413aaf15d1a6161df4f1a1867c5f60eb4c
    
    public TreeNode(int x) {
	val = x;
Solution content
public class TreeNode {
    public int val;
    TreeNode left;
    TreeNode right;
    
    public TreeNode(int x) {
	val = x;
File
TreeNode.java
Developer's decision
Version 1
Kind of conflict
Attribute