Projects >> scm-manager >>b34bf76dd2f1d21c565205fbf566d7d26213624c

Chunk
Conflicting content 
  //~--- fields ---------------------------------------------------------------

<<<<<<< HEAD
  /** Field description */
  private final ScmConfiguration configuration;
=======
  /** scm main configuration */
  protected ScmConfiguration configuration;
>>>>>>> 607fa3228dfb00cd237522b574bab574f6ad5e18
}
Solution content 
  //~--- fields ---------------------------------------------------------------

  /** scm main configuration */
  protected ScmConfiguration configuration;
}
File
BasicAuthenticationFilter.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
  @Deprecated
    this.configuration = configuration;
  }

<<<<<<< HEAD
=======
  /**
   * Constructs a new permission filter
   *
   * @param configuration global scm-manager configuration
   * @param securityContextProvider security context provider
   *
   * @deprecated {@link #PermissionFilter(ScmConfiguration)} instead
   */
  public PermissionFilter(ScmConfiguration configuration,
    Provider securityContextProvider)
  {
    this.configuration = configuration;
  }

>>>>>>> 607fa3228dfb00cd237522b574bab574f6ad5e18
  //~--- get methods ----------------------------------------------------------

  /**
Solution content 
    this.configuration = configuration;
  }

  //~--- get methods ----------------------------------------------------------

  /**
File
PermissionFilter.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
//~--- non-JDK imports --------------------------------------------------------

<<<<<<< HEAD
import com.github.legman.Subscribe;

=======
import com.google.common.base.Objects;
>>>>>>> 607fa3228dfb00cd237522b574bab574f6ad5e18
import com.google.inject.Inject;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
Solution content 
//~--- non-JDK imports --------------------------------------------------------

import com.github.legman.Subscribe;

import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
File
HgHookManager.java
Developer's decision
Concatenation
Kind of conflict
Import