[pdal-commits] [PDAL/PDAL] 679478: Remove merge conflict.

[Andrew Bell]

  Branch: refs/heads/issue-2937
  Home:   https://github.com/PDAL/PDAL
  Commit: 679478d1839b669435c486fd1d194dd495024c04
      https://github.com/PDAL/PDAL/commit/679478d1839b669435c486fd1d194dd495024c04
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

  Changed paths:
    M test/data/pipeline/issue2937.json.in

  Log Message:
  -----------
  Remove merge conflict.