Projects >> gwt-scheduler >>4abc2e98c254a9da1000622c56ff9616f628f378

Chunk
Conflicting content 
    this.getElement().getStyle().setZIndex(1);
    this.eventHeader.getElement().getStyle().setCursor(Style.Cursor.MOVE);
    roundedPanel.addStyleName(resStyle.roundedPanel());
<<<<<<< HEAD
  }

  @UiFactory
  public PushButton buildPushButton(){
    return new PushButton(new Image("../css/images/close.png")); //TODO: change the url for the javascript ->  css/images/close.png
=======
>>>>>>> 611a59186355b4cff7b61ab23124d913fc0d4e1c
  }

  @UiFactory
Solution content 
    this.getElement().getStyle().setZIndex(1);
    this.eventHeader.getElement().getStyle().setCursor(Style.Cursor.MOVE);
    roundedPanel.addStyleName(resStyle.roundedPanel());
  }

  @UiFactory
File
CalendarEventView.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method invocation
Method signature
Return statement