Projects information

Chunk

Conflicting content
committee.setPublishedDateTime(getLocalDateTimeFromRs(rs, "created")); committee.setReformed(getLocalDateTimeFromRs(rs, "reformed")); committee.setLocation(rs.getString("location")); <<<<<<< HEAD committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday")) ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null); ======= committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday")) ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null); >>>>>>> 54087009bc0bad421b68887988684651657aa7a4 committee.setMeetTime(rs.getTime("meettime") != null ? rs.getTime("meettime").toLocalTime() : null); committee.setMeetAltWeek(rs.getBoolean("meetaltweek")); committee.setMeetAltWeekText(rs.getString("meetaltweektext"));

Conflicting content

            committee.setPublishedDateTime(getLocalDateTimeFromRs(rs, "created"));
            committee.setReformed(getLocalDateTimeFromRs(rs, "reformed"));
            committee.setLocation(rs.getString("location"));
<<<<<<< HEAD
            committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday")) ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null);
=======
            committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday"))
                ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null);
>>>>>>> 54087009bc0bad421b68887988684651657aa7a4
            committee.setMeetTime(rs.getTime("meettime") != null ? rs.getTime("meettime").toLocalTime() : null);
            committee.setMeetAltWeek(rs.getBoolean("meetaltweek"));
            committee.setMeetAltWeekText(rs.getString("meetaltweektext"));

Solution content
committee.setPublishedDateTime(getLocalDateTimeFromRs(rs, "created")); committee.setReformed(getLocalDateTimeFromRs(rs, "reformed")); committee.setLocation(rs.getString("location")); committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday")) ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null); committee.setMeetTime(rs.getTime("meettime") != null ? rs.getTime("meettime").toLocalTime() : null); committee.setMeetAltWeek(rs.getBoolean("meetaltweek")); committee.setMeetAltWeekText(rs.getString("meetaltweektext"));

Solution content

            committee.setPublishedDateTime(getLocalDateTimeFromRs(rs, "created"));
            committee.setReformed(getLocalDateTimeFromRs(rs, "reformed"));
            committee.setLocation(rs.getString("location"));
            committee.setMeetDay(StringUtils.isNotEmpty(rs.getString("meetday"))
                ? DayOfWeek.valueOf(rs.getString("meetday").toUpperCase()) : null);
            committee.setMeetTime(rs.getTime("meettime") != null ? rs.getTime("meettime").toLocalTime() : null);
            committee.setMeetAltWeek(rs.getBoolean("meetaltweek"));
            committee.setMeetAltWeekText(rs.getString("meetaltweektext"));

File
SqlCommitteeDao.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Projects >> OpenLegislation >>5a8320300845d7739743ec68be7c54b691e1dbbc