[mapserver-commits] [mapserver/mapserver] 380f17: fix merge conflicts

[GitHub]

  Branch: refs/heads/branch-6-2
  Home:   https://github.com/mapserver/mapserver
  Commit: 380f17ba01c2adfdba5dca2d02c483486994310e
      https://github.com/mapserver/mapserver/commit/380f17ba01c2adfdba5dca2d02c483486994310e
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M mapwcs.c
    M mapwcs20.c

  Log Message:
  -----------
  fix merge conflicts