Projects >> wro4j >>d68ed3c5da2afd8c61f1094e9ccebbac53c33dd1

Chunk
Conflicting content 
import ro.isdc.wro.config.Context;
import ro.isdc.wro.config.factory.FilterConfigWroConfigurationFactory;
<<<<<<< HEAD
import ro.isdc.wro.config.factory.PropertiesAndFilterConfigWroConfigurationFactory;
=======
import ro.isdc.wro.config.factory.ServletContextPropertyWroConfigurationFactory;
import ro.isdc.wro.model.resource.locator.ClasspathUriLocator;
import ro.isdc.wro.model.resource.locator.ServletContextUriLocator;
import ro.isdc.wro.model.resource.locator.UriLocator;
import ro.isdc.wro.model.resource.locator.UrlUriLocator;
import ro.isdc.wro.model.resource.locator.factory.DefaultUriLocatorFactory;
import ro.isdc.wro.model.resource.locator.factory.SimpleUriLocatorFactory;
import ro.isdc.wro.model.resource.locator.factory.UriLocatorFactory;
>>>>>>> c722e01418e26747d9211e4dce9f315a4c0589c0
import ro.isdc.wro.model.resource.processor.ProcessorsUtils;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.factory.ConfigurableProcessorsFactory;
Solution content 
import ro.isdc.wro.config.Context;
import ro.isdc.wro.config.factory.FilterConfigWroConfigurationFactory;
import ro.isdc.wro.config.factory.ServletContextPropertyWroConfigurationFactory;
import ro.isdc.wro.model.resource.processor.ProcessorsUtils;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.factory.ConfigurableProcessorsFactory;
File
ConfigurableWroManagerFactory.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
  }

  /**
<<<<<<< HEAD
   * @param properties
   *          {@link Properties} object to get stream from.
   * @return {@link InputStream} of the provided properties object.
   */
  public static InputStream getPropertiesStream(final Properties properties) {
    final StringWriter propsAsString = new StringWriter();
    properties.list(new PrintWriter(propsAsString));
    return new ByteArrayInputStream(propsAsString.toString().getBytes()); 
  }
  
  /**
=======
>>>>>>> c722e01418e26747d9211e4dce9f315a4c0589c0
   * Compare contents of two resources (files) by performing some sort of processing on input resource.
   * 
   * @param inputResourceUri
Solution content 
  }

  /**
   * Compare contents of two resources (files) by performing some sort of processing on input resource.
   * 
   * @param inputResourceUri
File
WroTestUtils.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration