Projects >> fastjson >>4d721cb2c05106a375691899aa9d5b2b81987ad4

Chunk
Conflicting content 
                }
            }

<<<<<<< HEAD
            if (seperator != 0) {
                buf[count - 2] = '\"';
                buf[count - 1] = seperator;
            } else {
                buf[count - 1] = '\"';
            }
=======
            buf[count - 1] = '\"';
>>>>>>> 162ae20cc397d49337f6132a12bd72585d3960c5
            return;
        }
Solution content 
                }
            }

            if (seperator != 0) {
                buf[count - 2] = '\"';
                buf[count - 1] = seperator;
            } else {
                buf[count - 1] = '\"';
            }

            return;
        }
File
SerializeWriter.java
Developer's decision
Version 1
Kind of conflict
Array access
If statement