[Windup-commits] [windup/windup] 8de4df: WINDUP-1619: Marc's style changes

[Jess Sightler]

  Branch: refs/heads/master
  Home:   https://github.com/windup/windup
  Commit: 8de4df3e46cc255790dc085757b5931f9dfe0cb9
      https://github.com/windup/windup/commit/8de4df3e46cc255790dc085757b5931f9dfe0cb9
  Author: Marek Novotný <hotmana76 at gmail.com>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M reporting/impl/src/main/resources/reports/templates/application_list.ftl
    M reporting/impl/src/main/resources/reports/templates/migration-issues.ftl
    M rules-java/api/src/main/resources/reports/templates/dependency_report.ftl
    M rules-java/api/src/main/resources/reports/templates/unparsable_files.ftl

  Log Message:
  -----------
  WINDUP-1619: Marc's style changes


  Commit: 34dbc78b75f62fb68ff9fe1d63a69ad54767273f
      https://github.com/windup/windup/commit/34dbc78b75f62fb68ff9fe1d63a69ad54767273f
  Author: Jess Sightler <jesse.sightler at gmail.com>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M reporting/impl/src/main/resources/reports/templates/application_list.ftl
    M reporting/impl/src/main/resources/reports/templates/migration-issues.ftl
    M rules-java/api/src/main/resources/reports/templates/dependency_report.ftl
    M rules-java/api/src/main/resources/reports/templates/unparsable_files.ftl

  Log Message:
  -----------
  Merge branch 'WINDUP-1619' of https://github.com/mareknovotny/windup into mareknovotny-WINDUP-1619

# Conflicts:
#	reporting/impl/src/main/resources/reports/templates/migration-issues.ftl


  Commit: 0c6ae331ca3763dcfd22b39d4f4bc7b36af43e0e
      https://github.com/windup/windup/commit/0c6ae331ca3763dcfd22b39d4f4bc7b36af43e0e
  Author: Jess Sightler <jesse.sightler at gmail.com>
  Date:   2017-08-23 (Wed, 23 Aug 2017)

  Changed paths:
    M reporting/impl/src/main/resources/reports/templates/application_list.ftl
    M reporting/impl/src/main/resources/reports/templates/migration-issues.ftl
    M rules-java/api/src/main/resources/reports/templates/dependency_report.ftl
    M rules-java/api/src/main/resources/reports/templates/unparsable_files.ftl

  Log Message:
  -----------
  Merge branch 'mareknovotny-WINDUP-1619'


Compare: https://github.com/windup/windup/compare/35503df3b3a6...0c6ae331ca37