[Windup-commits] [windup/windup] 5455ba: WINDUP-810 - Fixed missing macro from merge issue.

Branch: refs/heads/master Home: https://github.com/windup/windup Commit: 5455bac6a25ac8bb500ad7981ec6cc07d6c47fdf https://github.com/windup/windup/commit/5455bac6a25ac8bb500ad7981ec6cc07d... Author: Brad Davis <bradsdavis(a)gmail.com&gt; Date: 2015-10-16 (Fri, 16 Oct 2015) Changed paths: M rules-java-ee/addon/src/main/resources/reports/templates/jboss/jboss-ejb3.ftl Log Message: ----------- WINDUP-810 - Fixed missing macro from merge issue. Commit: ad5bc93b0486decafe9ce70ddc336f6ce0e60aca https://github.com/windup/windup/commit/ad5bc93b0486decafe9ce70ddc336f6ce... Author: Ondrej Zizka <zizka(a)seznam.cz&gt; Date: 2015-10-19 (Mon, 19 Oct 2015) Changed paths: M rules-java-ee/addon/src/main/resources/reports/templates/jboss/jboss-ejb3.ftl Log Message: ----------- Merge pull request #732 from bradsdavis/WINDUP-810 WINDUP-810 - Freemarker fails at @processTxTimeout - Fixed missing macro from merge issue. Compare: https://github.com/windup/windup/compare/189a3e7df268...ad5bc93b0486