package com.psychic_engine.cmput301w17t10.feelsappman;

/**
 * Created by adong on 2/27/17.
 */
public enum SocialSetting {
<<<<<<< HEAD
        alone(1),
        oneother(2),
        twotoseveral(3),
        crowd(4);
=======
        alone, oneOther, twoToSeveral, crowd;
>>>>>>> f81e220785a82b58e63c3a00b575780d487ff7d6
}

@@ -121,204 +121,53 @@
 g %7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A        alone(1),%0A        oneother(2),%0A        twotoseveral(3),%0A        crowd(4);%0A=======%0A        alone, oneOther, twoToSeveral, crowd;%0A%3E%3E%3E%3E%3E%3E%3E f81e220785a82b58e63c3a00b575780d487ff7d6
+        alone, oneOther, twoToSeveral, crowd;%0A
 %0A%7D%0A

Update SocialSetting.java