Projects >> MinecraftBot >>81745622b2fd448be8cc9f49faebb57fe86674cf

Chunk
Conflicting content 
                    prefix = "~";
                }
                    // Owner
                    prefix = "+";
                }
                else if (nick.startsWith("~")) {
<<<<<<< HEAD
                else if (nick.startsWith("%")) {
                    // Half-op
=======
                    // Channel owner
                    prefix = "~";
                }
                else if (nick.startsWith("%")) {
                    // Half-operator
>>>>>>> 1765a8aa997ecfd5d68df1a82cc8f77c9a2f057f
                    prefix = "%";
                }
                else if (nick.startsWith("&")) {
Solution content 
                    prefix = "+";
                }
                else if (nick.startsWith("~")) {
                    // Channel owner
                    prefix = "~";
                }
                else if (nick.startsWith("%")) {
                    // Half-operator
                    prefix = "%";
                }
                else if (nick.startsWith("&")) {
File
PircBot.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Variable