Projects >> gwt-scheduler >>5efbe7fbb0f8b3637493dd9c3be3ec762c8582cd

Chunk
Conflicting content 
    this.columns = columns;
    initWidget(uiBinder.createAndBindUi(this));
    content.getEventsPanel().setComplexGrid(this);
<<<<<<< HEAD

=======
    
>>>>>>> 75caeddb957c01ea641c95e2a303827e07af8b52
    content.getLassoAwarePanel().addWidgetResizeHandler(content.getCalendarColumnsFrameGridDisplay().getWidgetResizeHandler());
    content.getLassoAwarePanel().addWidgetResizeHandler(header.getCalendarHeaderResizeHandler());
Solution content 
    this.columns = columns;
    initWidget(uiBinder.createAndBindUi(this));
    content.getEventsPanel().setComplexGrid(this);
    
    content.getLassoAwarePanel().addWidgetResizeHandler(content.getCalendarColumnsFrameGridDisplay().getWidgetResizeHandler());
    content.getLassoAwarePanel().addWidgetResizeHandler(header.getCalendarHeaderResizeHandler());
File
ColumnsViewWidget.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
  @Override
  public CalendarContent.Display getCalendarContentDisplay() {
<<<<<<< HEAD
    return content;
=======
    return content;  
>>>>>>> 75caeddb957c01ea641c95e2a303827e07af8b52
  }

  @Override
Solution content 
  @Override
  public CalendarContent.Display getCalendarContentDisplay() {
    return content;  
  }

  @Override
File
ColumnsViewWidget.java
Developer's decision
Version 1
Kind of conflict
Attribute
Return statement