Projects >> IRCBot >>9577713f137dad00b5d8853ba430c90705436939

Chunk
Conflicting content 
        	
		ResultSet result = sCount.executeQuery();
		if (result.next()) {
        	int count = result.getInt(1);
<<<<<<< HEAD
        	if(count == 0) return null;
=======
        	if( count==0 ) return null;
>>>>>>> 54f12adb0e71ebd454dd81223c1545b74db4c83f
        	int item = (new Random()).nextInt(count) + 1;
			PreparedStatement statement = conn.prepareStatement(
Solution content 
		ResultSet result = sCount.executeQuery();
		if (result.next()) {
        	int count = result.getInt(1);
        	if(count == 0) return null;
        	int item = (new Random()).nextInt(count) + 1;
        	
			PreparedStatement statement = conn.prepareStatement(
File
TitleDB.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    			
    			section = new LinkedList();
    			secname = line.substring(1, line.length()-1);
<<<<<<< HEAD
                map.put(secname, section);
=======
>>>>>>> 54f12adb0e71ebd454dd81223c1545b74db4c83f
    		} else if ( section != null ) {
    			section.add(line);
    		}
Solution content 
    			
    			section = new LinkedList();
    			secname = line.substring(1, line.length()-1);
                map.put(secname, section);
    		} else if ( section != null ) {
    			section.add(line);
    		}
File
SillyConfiguration.java
Developer's decision
Version 1
Kind of conflict
Method invocation