[Windup-commits] [windup/windup] a74042: Rebase conflicts remnants

Branch: refs/heads/Modularize-03 Home: https://github.com/windup/windup Commit: a7404292ecfa98acedee767a34b0b27cd494b108 https://github.com/windup/windup/commit/a7404292ecfa98acedee767a34b0b27cd... Author: OndraZizka <zizka(a)seznam.cz&gt; Date: 2014-06-19 (Thu, 19 Jun 2014) Changed paths: M graph/impl/src/main/java/org/jboss/windup/graph/GraphContextProvider.java M rules/app/java/src/main/java/org/jboss/windup/rules/apps/java/scan/provider/DiscoverJavaFilesConfigurationProvider.java Log Message: ----------- Rebase conflicts remnants