Projects >> sisu-guice >>ad33adf2d755cd95b83a61f27f8a79461838dce4

Chunk
Conflicting content 
    assertEquals(expected, s1);
  }

<<<<<<< HEAD
  public void ignoreTestSetAndMapValueConflict() {
=======
  public void failing_testSetAndMapValueConflict() {
>>>>>>> 88b6d13516baf195e2dcb6b3577df107e988999a
    Injector injector = Guice.createInjector(new AbstractModule() {
      @Override protected void configure() {
        Multibinder.newSetBinder(binder(), String.class)
Solution content 
    assertEquals(expected, s1);
  }

  public void failing_testSetAndMapValueConflict() {
    Injector injector = Guice.createInjector(new AbstractModule() {
      @Override protected void configure() {
        Multibinder.newSetBinder(binder(), String.class)
File
MultibinderTest.java
Developer's decision
Version 2
Kind of conflict
Method signature