2 files + 9 − 0 Inline Compare changes Side-by-side Inline Show whitespace changes Files 2 names/sereres.dat +5 −0 Original line number Diff line number Diff line <<<<<<< HEAD creating conflict ======= >>>>>>> develop 01110011 01100101 01110010 01100101 01110010 01100101 01110011 names/sereres.xml 0 → 100644 +4 −0 Original line number Diff line number Diff line <bracket DERP > <info name = "Sereres"/> </bracket>
names/sereres.dat +5 −0 Original line number Diff line number Diff line <<<<<<< HEAD creating conflict ======= >>>>>>> develop 01110011 01100101 01110010 01100101 01110010 01100101 01110011
names/sereres.xml 0 → 100644 +4 −0 Original line number Diff line number Diff line <bracket DERP > <info name = "Sereres"/> </bracket>