Projects >> intellij-community >>2bb19572a80ac6d234a9886b1d9eae1f3853bd4d

Chunk
Conflicting content 
  /**
   * {@inheritDoc}
   */
<<<<<<< HEAD
  @NotNull
=======
>>>>>>> ea26b6cd8189da8f6e8d0418af6cf15f5d1ebcf2
  @Override
  protected Action[] createActions() {
    List baseActions = new ArrayList();
Solution content 
  /**
   * {@inheritDoc}
   */
  @NotNull
  @Override
  protected Action[] createActions() {
    List baseActions = new ArrayList();
File
ChangeMasterKeyDialog.java
Developer's decision
Version 1
Kind of conflict
Annotation