Projects >> Custom-Salem >>4d871477f721c49a6b5ffaffeb726d2450be5ba5

Chunk
Conflicting content 
import java.io.*;
import java.lang.ref.*;

<<<<<<< HEAD
public class Session implements Owner {
    public static final int PVER = 31;
=======
public class Session {
    public static final int PVER = 32;
>>>>>>> 9ceed0141d62f482649d4da9f444d7fc0164411d
    
    public static final int MSG_SESS = 0;
    public static final int MSG_REL = 1;
Solution content 
import java.io.*;
import java.lang.ref.*;

public class Session implements Owner {
    public static final int PVER = 32;
    
    public static final int MSG_SESS = 0;
    public static final int MSG_REL = 1;
File
Session.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature