[mapserver-commits] [mapserver/mapserver] 1077d8: fix merge conflicts from previous commit

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 1077d82046d675b962e16680de02eeaa3f266cf1
      https://github.com/mapserver/mapserver/commit/1077d82046d675b962e16680de02eeaa3f266cf1
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M maplexer.c
    M mapogroutput.c

  Log Message:
  -----------
  fix merge conflicts from previous commit