Projects >> wro4j >>272a9640e5ddd82172e7baefe86f3c7efbb28674

Chunk
Conflicting content 
    }
    return computeCacheValueByContent(content);
  }
<<<<<<< HEAD

  private long getResourceWatcherUpdatePeriod() {
    return context.getConfig().getResourceWatcherUpdatePeriod();
  }
  /**
   * @return {@link TimeUnit} used to run resourceWatcher. 
   * @VisibleForTesting
   */
  TimeUnit getTimeUnitForResourceWatcher() {
    return TimeUnit.SECONDS;
  }

=======
  
>>>>>>> b6802ba9ffeac99f47bbfe08ba5ab4815a695f39
  /**
   * Creates a {@link ContentHashEntry} based on provided content.
   */
Solution content 
    }
    return computeCacheValueByContent(content);
  }

  private long getResourceWatcherUpdatePeriod() {
    return context.getConfig().getResourceWatcherUpdatePeriod();
  }

  /**
   * @return {@link TimeUnit} used to run resourceWatcher. 
   * @VisibleForTesting
   */
  TimeUnit getTimeUnitForResourceWatcher() {
    return TimeUnit.SECONDS;
  }

  /**
   * Creates a {@link ContentHashEntry} based on provided content.
   */
File
DefaultSynchronizedCacheStrategyDecorator.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration