Projects >> CS-project >>6bb7c4ce7b25e374942cad77e2fa1f9d0ef0e8ce

Chunk
Conflicting content 
    public Investor(Market mar){
        _money = 5000.0;
        _oldmoney = 0;
<<<<<<< HEAD
        _confidence = _confidence = 43 + Random(16);
=======
        _confidence = 43 + (int)(16*Math.random());
>>>>>>> 9bbe3b08a472f86caf08263239742c222ebb58ce
        _stockVal = 0;
        _stockValChanged = 0;
        _market = mar;
Solution content 
    public Investor(Market mar){
        _money = 5000.0;
        _oldmoney = 0;
<<<<<<< HEAD
        _confidence = _confidence = 43 + Random(16);
=======
        _confidence = 43 + (int)(16*Math.random());
>>>>>>> 9bbe3b08a472f86caf08263239742c222ebb58ce
        _stockVal = 0;
        _stockValChanged = 0;
        _market = mar;
File
Investor.java
Developer's decision
Manual
Kind of conflict
Attribute
Cast expression
Method invocation