Skip to content
Permalink
Browse files

resolving conflicts with master branch

  • Loading branch information
Samweli committed Dec 21, 2019
1 parent e8fd26c commit 93537d3a7ecefa88a6b585b841fa0bd7df7c3e92
Showing with 507 additions and 515 deletions.
  1. +482 −490 src/providers/wms/qgswmscapabilities.cpp
  2. +25 −25 src/providers/wms/qgswmscapabilities.h

0 comments on commit 93537d3

Please sign in to comment.
You can’t perform that action at this time.